X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=2580a303253d1777a7c52f0e6f84f4972db0d026;hb=96844f9b3559fde478588c22f91bbe2e67bde9f4;hp=ef8e9ac89c957164a3206a7e4fcb59f8496197be;hpb=b68256173ba650db55e103b98412e9024d8f81d8;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index ef8e9ac89..2580a3032 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -2,10 +2,10 @@ # # Copyright (C) 2002-2007 Free Software Foundation, Inc. # -# This program is free software; you can redistribute it and/or modify +# This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -13,8 +13,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # # This program is meant for authors or maintainers which want to import @@ -22,9 +21,11 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2007-06-23 07:40:58 $' +cvsdatestamp='$Date: 2007-09-17 10:26:33 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` +# Sometimes last_checkin_date is "YYYY/MM/DD ...", sometimes "YYYY-MM-DD ...". version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` +# version is in YYYY-MM-DD format. nl=' ' IFS=" "" $nl" @@ -73,6 +74,17 @@ fi # gnulib-tool generates, since we don't want "sed --posix" to leak # into makefiles. if (alias) > /dev/null 2>&1 && echo | sed --posix -e d >/dev/null 2>&1; then + # Define sed as an alias. + # It is not always possible to use aliases. Aliases are guaranteed to work + # if the executing shell is bash and either it is invoked as /bin/sh or + # is a version >= 2.0, supporting shopt. This is the common case. + # Two other approaches (use of a variable $sed or of a function func_sed + # instead of an alias) require massive, fragile code changes. + # An other approach (use of function sed) requires `which sed` - but 'which' + # is hard to emulate, due to missing "test -x" on some platforms. + if test -n "$BASH_VERSION"; then + shopt -s expand_aliases >/dev/null 2>&1 + fi alias sed='sed --posix' fi @@ -89,6 +101,7 @@ Usage: gnulib-tool --list gnulib-tool --test --dir=directory module1 ... moduleN gnulib-tool --megatest --dir=directory [module1 ... moduleN] gnulib-tool --extract-description module + gnulib-tool --extract-notice module gnulib-tool --extract-filelist module gnulib-tool --extract-dependencies module gnulib-tool --extract-autoconf-snippet module @@ -114,6 +127,7 @@ Operation modes: --megatest test the given modules one by one and all together (recommended to use CC=\"gcc -Wall\" here) --extract-description extract the description + --extract-notice extract the notice or banner --extract-filelist extract the list of files --extract-dependencies extract the dependencies --extract-autoconf-snippet extract the snippet for configure.ac @@ -132,6 +146,8 @@ General options: directory. --local-dir=DIRECTORY Specify a local override directory where to look up files before looking in gnulib's directory. + --verbose Increase verbosity. May be repeated. + --quiet Decrease verbosity. May be repeated. Options for --import: --lib=LIBRARY Specify the library name. Defaults to 'libgnu'. @@ -140,6 +156,8 @@ Options for --import: placed (default \"lib\"). --m4-base=DIRECTORY Directory relative to --dir where *.m4 macros are placed (default \"m4\"). + --po-base=DIRECTORY Directory relative to --dir where *.po files are + placed (default \"po\"). --doc-base=DIRECTORY Directory relative to --dir where doc files are placed (default \"doc\"). --tests-base=DIRECTORY @@ -151,8 +169,10 @@ Options for --import: --avoid=MODULE Avoid including the given MODULE. Useful if you have code that provides equivalent functionality. This option can be repeated. - --lgpl Abort if modules aren't available under the LGPL. + --lgpl[=2|=3] Abort if modules aren't available under the LGPL. Also modify license template from GPL to LGPL. + The version number of the LGPL can be specified; + the default is currently LGPLv3. --makefile-name=NAME Name of makefile in automake syntax in the source-base and tests-base directories (default \"Makefile.am\"). @@ -160,6 +180,8 @@ Options for --import: --no-libtool Don't use libtool rules. --macro-prefix=PREFIX Specify the prefix of the macros 'gl_EARLY' and 'gl_INIT'. Default is 'gl'. + --po-domain=NAME Specify the prefix of the i18n domain. Usually use + the package name. A suffix '-gnulib' is appended. --no-changelog don't update or create ChangeLog files Options for --import and --update: @@ -167,6 +189,8 @@ Options for --import and --update: -s, --symbolic, --symlink Make symbolic links instead of copying files. --local-symlink Make symbolic links instead of copying files, only for files from the local override directory. + -S, --more-symlinks Make symbolic links instead of copying files, and + don't replace copyright notices. Report bugs to ." } @@ -175,7 +199,7 @@ Report bugs to ." # outputs to stdout the --version message. func_version () { - year=`echo "$last_checkin_date" | sed -e 's,/.*$,,'` + year=`echo "$version" | sed -e 's,-.*$,,'` echo "\ $progname (GNU $package) $version Copyright (C) $year Free Software Foundation, Inc. @@ -403,7 +427,7 @@ func_ln_if_changed () echo "usage: func_ln_if_changed SRC DEST" >&2 fi ln_target=`func_readlink "$2"` - if test -L "$2" && test "$1" = "$ln_target"; then + if test -h "$2" && test "$1" = "$ln_target"; then : else rm -f "$2" @@ -415,19 +439,26 @@ func_ln_if_changed () # Test cases: # echo '\n' | wc -l prints 1 when OK, 2 when KO # echo '\t' | grep t > /dev/null has return code 0 when OK, 1 when KO -# This problem is a weird heritage from SVR4. BSD got it right. +# This problem is a weird heritage from SVR4. BSD got it right (except that +# BSD echo interprets '-n' as an option, which is also not desirable). # Nowadays the problem occurs in 4 situations: -# - in bash, when the shell option xpg_echo is set, +# - in bash, when the shell option xpg_echo is set (bash >= 2.04) +# or when it was built with --enable-usg-echo-default (bash >= 2.0) +# or when it was built with DEFAULT_ECHO_TO_USG (bash < 2.0), # - in zsh, when sh-emulation is not set, # - in ksh (e.g. AIX /bin/sh and Solaris /usr/xpg4/bin/sh are ksh instances, # and HP-UX /bin/sh and IRIX /bin/sh behave similarly), # - in Solaris /bin/sh and OSF/1 /bin/sh. # We try the following workarounds: # - for all: respawn using $CONFIG_SHELL if that is set and works. -# - for bash: unset the shell option xpg_echo. +# - for bash >= 2.04: unset the shell option xpg_echo. +# - for bash >= 2.0: define echo to a function that uses the printf built-in. +# - for bash < 2.0: define echo to a function that uses cat of a here document. # - for zsh: turn sh-emulation on. +# - for ksh: alias echo to 'print -r'. # - for ksh: alias echo to a function that uses cat of a here document. -# - for Solaris /bin/sh: respawn using /bin/ksh and rely on the ksh workaround. +# - for Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh and rely on +# the ksh workaround. # - otherwise: respawn using /bin/sh and rely on the workarounds. # When respawning, we pass --no-reexec as first argument, so as to avoid # turning this script into a fork bomb in unlucky situations. @@ -445,26 +476,68 @@ if test -z "$have_echo" \ exec $CONFIG_SHELL "$0" --no-reexec "$@" exit 127 fi -# For bash: unset the shell option xpg_echo. +# For bash >= 2.04: unset the shell option xpg_echo. if test -z "$have_echo" \ && test -n "$BASH_VERSION" \ && (shopt -o xpg_echo; echo '\t' | grep t > /dev/null) 2>/dev/null; then shopt -o xpg_echo have_echo=yes fi +# For bash >= 2.0: define echo to a function that uses the printf built-in. +# For bash < 2.0: define echo to a function that uses cat of a here document. +# (There is no win in using 'printf' over 'cat' if it is not a shell built-in.) +if test -z "$have_echo" \ + && test -n "$BASH_VERSION"; then \ + if type printf 2>/dev/null | grep / > /dev/null; then + # 'printf' is not a shell built-in. +echo () +{ +cat < /dev/null; then + have_echo=yes + fi +fi # For zsh: turn sh-emulation on. if test -z "$have_echo" \ && test -n "$ZSH_VERSION" \ && (emulate sh) >/dev/null 2>&1; then emulate sh fi +# For ksh: alias echo to 'print -r'. +if test -z "$have_echo" \ + && (type print) >/dev/null 2>&1; then + # A 'print' command exists. + if type print 2>/dev/null | grep / > /dev/null; then + : + else + # 'print' is a shell built-in. + if (print -r '\told' | grep told > /dev/null) 2>/dev/null; then + # 'print' is the ksh shell built-in. + alias echo='print -r' + fi + fi +fi +if test -z "$have_echo" \ + && echo '\t' | grep t > /dev/null; then + have_echo=yes +fi # For ksh: alias echo to a function that uses cat of a here document. # The ksh manual page says: # "Aliasing is performed when scripts are read, not while they are executed. # Therefore, for an alias to take effect, the alias definition command has # to be executed before the command which references the alias is read." # Because of this, we have to play strange tricks with have_echo, to ensure -# that the top-level statement containing the test start after the 'alias' +# that the top-level statement containing the test starts after the 'alias' # command. if test -z "$have_echo"; then bsd_echo () @@ -513,32 +586,39 @@ fi # - mode list or import or create-testdir or create-megatestdir # - destdir from --dir # - local_gnulib_dir from --local-dir +# - verbose integer, default 0, inc/decremented by --verbose/--quiet # - libname, supplied_libname from --lib # - sourcebase from --source-base # - m4base from --m4-base +# - pobase from --po-base # - docbase from --doc-base # - testsbase from --tests-base # - auxdir from --aux-dir # - inctests true if --with-tests was given, blank otherwise # - avoidlist list of modules to avoid, from --avoid -# - lgpl true if --lgpl was given, blank otherwise +# - lgpl yes or a number if --lgpl was given, blank otherwise # - makefile_name from --makefile-name # - libtool true if --libtool was given, false if --no-libtool was # given, blank otherwise # - macro_prefix from --macro-prefix +# - po_domain from --po-domain # - autoconf_minversion minimum supported autoconf version # - do_changelog false if --no-changelog was given, : otherwise # - doit : if actions shall be executed, false if only to be printed -# - symbolic true if --symlink was given, blank otherwise +# - symbolic true if --symlink or --more-symlinks was given, blank +# otherwise # - lsymbolic true if --local-symlink was given, blank otherwise +# - do_copyrights blank if --more-symlinks was given, true otherwise { mode= destdir= local_gnulib_dir= + verbose=0 libname=libgnu supplied_libname= sourcebase= m4base= + pobase= docbase= testsbase= auxdir= @@ -548,10 +628,12 @@ fi makefile_name= libtool= macro_prefix= + po_domain= do_changelog=: doit=: symbolic= lsymbolic= + do_copyrights=true supplied_opts="$@" @@ -601,6 +683,12 @@ fi --local-dir=* ) local_gnulib_dir=`echo "X$1" | sed -e 's/^X--local-dir=//'` shift ;; + --verbose | --verbos | --verbo | --verb ) + verbose=`expr $verbose + 1` + shift ;; + --quiet | --quie | --qui | --qu | --q ) + verbose=`expr $verbose - 1` + shift ;; --lib ) shift if test $# = 0; then @@ -633,6 +721,16 @@ fi --m4-base=* ) m4base=`echo "X$1" | sed -e 's/^X--m4-base=//'` shift ;; + --po-base ) + shift + if test $# = 0; then + func_fatal_error "missing argument for --po-base" + fi + pobase=$1 + shift ;; + --po-base=* ) + pobase=`echo "X$1" | sed -e 's/^X--po-base=//'` + shift ;; --doc-base ) shift if test $# = 0; then @@ -678,7 +776,15 @@ fi func_append avoidlist " $arg" shift ;; --lgpl ) - lgpl=true + lgpl=yes + shift ;; + --lgpl=* ) + arg=`echo "X$1" | sed -e 's/^X--lgpl=//'` + case "$arg" in + 2 | 3) ;; + *) func_fatal_error "invalid LGPL version number for --lgpl" ;; + esac + lgpl=$arg shift ;; --makefile-name ) shift @@ -706,6 +812,16 @@ fi --macro-prefix=* ) macro_prefix=`echo "X$1" | sed -e 's/^X--macro-prefix=//'` shift ;; + --po-domain ) + shift + if test $# = 0; then + func_fatal_error "missing argument for --po-domain" + fi + po_domain="$1" + shift ;; + --po-domain=* ) + po_domain=`echo "X$1" | sed -e 's/^X--po-domain=//'` + shift ;; --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch | --no-c ) do_changelog=false shift ;; @@ -718,10 +834,14 @@ fi --local-symlink | --local-symlin | --local-symli | --local-syml | --local-sym | --local-sy | --local-s ) lsymbolic=true shift ;; + -S | --more-symlinks | --more-symlink | --more-symlin | --more-symli | --more-syml | --more-sym | --more-sy | --more-s | --more- | --more | --mor | --mo ) + symbolic=true + do_copyrights= + shift ;; --help | --hel | --he | --h ) func_usage func_exit $? ;; - --version | --versio | --versi | --vers | --ver | --ve | --v ) + --version | --versio | --versi | --vers ) func_version func_exit $? ;; -- ) @@ -746,10 +866,11 @@ fi func_exit 1 fi if test -n "$local_gnulib_dir" || test -n "$supplied_libname" \ - || test -n "$sourcebase" || test -n "$m4base" \ + || test -n "$sourcebase" || test -n "$m4base" || test -n "$pobase" \ || test -n "$docbase" || test -n "$testsbase" || test -n "$auxdir" \ || test -n "$inctests" || test -n "$avoidlist" || test -n "$lgpl" \ - || test -n "$makefile_name" || test -n "$macro_prefix"; then + || test -n "$makefile_name" || test -n "$macro_prefix" \ + || test -n "$po_domain"; then echo "gnulib-tool: invalid options for 'update' mode" 1>&2 echo "Try 'gnulib-tool --help' for more information." 1>&2 echo "If you really want to modify the gnulib configuration of your project," 1>&2 @@ -758,6 +879,14 @@ fi fi do_changelog=false fi + if test -n "$pobase" && test -z "$po_domain"; then + echo "gnulib-tool: together with --po-base, you need to specify --po-domain" 1>&2 + echo "Try 'gnulib-tool --help' for more information." 1>&2 + func_exit 1 + fi + if test -z "$pobase" && test -n "$po_domain"; then + echo "gnulib-tool: warning: --po-domain has no effect without a --po-base option" 1>&2 + fi # Determine the minimum supported autoconf version from the project's # configure.ac. @@ -823,6 +952,9 @@ fi case "$m4base" in */ ) m4base=`echo "$m4base" | sed -e "$sed_trimtrailingslashes"` ;; esac + case "$pobase" in + */ ) pobase=`echo "$pobase" | sed -e "$sed_trimtrailingslashes"` ;; + esac case "$docbase" in */ ) docbase=`echo "$docbase" | sed -e "$sed_trimtrailingslashes"` ;; esac @@ -838,23 +970,61 @@ case "$0" in /*) self_abspathname="$0" ;; */*) self_abspathname=`pwd`/"$0" ;; *) - - self_abspathname= - save_IFS=$IFS - IFS=: - for d in $PATH; do - IFS=$save_IFS - test -z "$d" && d=. - if test -x "$d/$0" && test ! -d "$d/$0"; then - self_abspathname=$d/$0 - break + # Look in $PATH. + # Iterate through the elements of $PATH. + # We use IFS=: instead of + # for d in `echo ":$PATH:" | sed -e 's/:::*/:.:/g' | sed -e 's/:/ /g'` + # because the latter does not work when some PATH element contains spaces. + # We use a canonicalized $pathx instead of $PATH, because empty PATH + # elements are by definition equivalent to '.', however field splitting + # according to IFS=: loses empty fields in many shells: + # - /bin/sh on OSF/1 and Solaris loses all empty fields (at the + # beginning, at the end, and in the middle), + # - /bin/sh on IRIX and /bin/ksh on IRIX and OSF/1 lose empty fields + # at the beginning and at the end, + # - GNU bash, /bin/sh on AIX and HP-UX, and /bin/ksh on AIX, HP-UX, + # Solaris lose empty fields at the end. + # The 'case' statement is an optimization, to avoid evaluating the + # explicit canonicalization command when $PATH contains no empty fields. + self_abspathname= + if test "${PATH_SEPARATOR+set}" != set; then + func_tmpdir + { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh + chmod +x "$tmp"/conf.sh + if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -rf "$tmp" fi - done - IFS=$save_IFS - if test -z "$self_abspathname"; then - func_fatal_error "could not locate the gnulib-tool program - how did you invoke it?" - fi - ;; + if test "$PATH_SEPARATOR" = ";"; then + # On Windows, programs are searched in "." before $PATH. + pathx=".;$PATH" + else + # On Unix, we have to convert empty PATH elements to ".". + pathx="$PATH" + case :$PATH: in + *::*) + pathx=`echo ":$PATH:" | sed -e 's/:::*/:.:/g' -e 's/^://' -e 's/:\$//'` + ;; + esac + fi + save_IFS="$IFS" + IFS="$PATH_SEPARATOR" + for d in $pathx; do + IFS="$save_IFS" + test -z "$d" && d=. + if test -x "$d/$0" && test ! -d "$d/$0"; then + self_abspathname="$d/$0" + break + fi + done + IFS="$save_IFS" + if test -z "$self_abspathname"; then + func_fatal_error "could not locate the gnulib-tool program - how did you invoke it?" + fi + ;; esac while test -h "$self_abspathname"; do # Resolve symbolic link. @@ -996,6 +1166,7 @@ sed_extract_prog=':[ ]*$/ { :a n s/^Description:[ ]*$// + s/^Notice:[ ]*$// s/^Files:[ ]*$// s/^Depends-on:[ ]*$// s/^configure\.ac-early:[ ]*$// @@ -1020,6 +1191,15 @@ func_get_description () sed -n -e "/^Description$sed_extract_prog" < "$lookedup_file" } +# func_get_notice module +# Input: +# - local_gnulib_dir from --local-dir +func_get_notice () +{ + func_lookup_file "modules/$1" + sed -n -e "/^Notice$sed_extract_prog" < "$lookedup_file" +} + # func_get_filelist module # Input: # - local_gnulib_dir from --local-dir @@ -1042,7 +1222,7 @@ func_get_filelist () func_get_dependencies () { # ${module}-tests always implicitly depends on ${module}. - echo "$1" | sed -n -e 's/-tests//p' + echo "$1" | sed -n -e 's/-tests$//p' # Then the explicit dependencies listed in the module description. func_lookup_file "modules/$1" sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file" @@ -1076,6 +1256,18 @@ func_get_automake_snippet () case "$1" in *-tests) # *-tests module live in tests/, not lib/. + # Synthesize an EXTRA_DIST augmentation. + all_files=`func_get_filelist $1` + tests_files=`for f in $all_files; do \ + case $f in \ + tests/*) echo $f ;; \ + esac; \ + done | sed -e 's,^tests/,,'` + extra_files="$tests_files" + if test -n "$extra_files"; then + echo "EXTRA_DIST +=" $extra_files + echo + fi ;; *) # Synthesize an EXTRA_DIST augmentation. @@ -1127,6 +1319,17 @@ func_get_automake_snippet () fi ;; esac + # Synthesize an EXTRA_DIST augmentation also for the files in build-aux/. + buildaux_files=`for f in $all_files; do \ + case $f in \ + build-aux/*) echo $f ;; \ + esac; \ + done | sed -e 's,^build-aux/,,'` + if test -n "$buildaux_files"; then + sed_prepend_auxdir='s,^,$(top_srcdir)/'"$auxdir"'/,' + echo "EXTRA_DIST += "`echo "$buildaux_files" | sed -e "$sed_prepend_auxdir"` + echo + fi ;; esac } @@ -1287,6 +1490,27 @@ ba fi } +# func_modules_notice +# Input: +# - local_gnulib_dir from --local-dir +# - verbose integer, default 0, inc/decremented by --verbose/--quiet +# - modules list of modules, including dependencies +func_modules_notice () +{ + if test $verbose -ge -1; then + for module in $modules; do + func_verify_module + if test -n "$module"; then + msg=`func_get_notice $module` + if test -n "$msg"; then + echo "Notice from module $module:" + echo "$msg" | sed -e 's/^/ /' + fi + fi + done + fi +} + # func_modules_to_filelist # Input: # - local_gnulib_dir from --local-dir @@ -1306,16 +1530,43 @@ func_modules_to_filelist () files=`for f in $files; do echo $f; done | LC_ALL=C sort -u` } +# func_execute_command command [args...] +# Executes a command. +# Uses also the variables +# - verbose integer, default 0, inc/decremented by --verbose/--quiet +func_execute_command () +{ + if test $verbose -ge 0; then + echo "executing $*" + "$@" + else + # Commands like automake produce output to stderr even when the succeed. + # Turn this output off if the command succeeds. + "$@" > "$tmp"/cmdout 2>&1 + cmdret=$? + if test $cmdret = 0; then + rm -f "$tmp"/cmdout + else + echo "executing $*" + cat "$tmp"/cmdout 1>&2 + rm -f "$tmp"/cmdout + (exit $cmdret) + fi + fi +} + # func_emit_lib_Makefile_am # emits the contents of library makefile to standard output. # Input: # - local_gnulib_dir from --local-dir # - modules list of modules, including dependencies # - libname library name +# - pobase directory relative to destdir where to place *.po files # - auxdir directory relative to destdir where to place build aux files # - makefile_name from --makefile-name # - libtool true if libtool will be used, false or blank otherwise # - macro_prefix prefix of gl_LIBOBJS macros to use +# - po_domain prefix of i18n domain to use (without -gnulib suffix) # - actioncmd (optional) command that will reproduce this invocation # - for_test true if creating a package for testing, false otherwise # Output: @@ -1443,6 +1694,10 @@ func_emit_lib_Makefile_am () echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)" fi echo + if test -n "$pobase"; then + echo "AM_CPPFLAGS += -DDEFAULT_TEXT_DOMAIN=\\\"${po_domain}-gnulib\\\"" + echo + fi cat allsnippets.tmp \ | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' echo @@ -1451,31 +1706,108 @@ func_emit_lib_Makefile_am () echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\" echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" echo " fi; \\" - echo " done" + echo " done; \\" + echo " :" rm -f allsnippets.tmp } +# func_emit_po_Makevars +# emits the contents of po/ makefile parametrization to standard output. +# Input: +# - local_gnulib_dir from --local-dir +# - sourcebase directory relative to destdir where to place source code +# - pobase directory relative to destdir where to place *.po files +# - po_domain prefix of i18n domain to use (without -gnulib suffix) +func_emit_po_Makevars () +{ + echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" + func_emit_copyright_notice + echo + echo "# Usually the message domain is the same as the package name." + echo "# But here it has a '-gnulib' suffix." + echo "DOMAIN = ${po_domain}-gnulib" + echo + echo "# These two variables depend on the location of this directory." + echo "subdir = ${pobase}" + echo "top_builddir = "`echo "$pobase" | sed -e 's,//*,/,g' -e 's,[^/][^/]*,..,g'` + echo + cat <<\EOF +# These options get passed to xgettext. +XGETTEXT_OPTIONS = \ + --keyword=_ --flag=_:1:pass-c-format \ + --keyword=N_ --flag=N_:1:pass-c-format \ + --keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."' \ + --keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."' \ + --flag=error:3:c-format --flag=error_at_line:5:c-format + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. gnulib is copyrighted by the FSF. +COPYRIGHT_HOLDER = Free Software Foundation, Inc. + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = bug-gnulib@gnu.org + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = no +EOF +} + +# func_emit_po_POTFILES_in +# emits the file list to be passed to xgettext to standard output. +# Input: +# - local_gnulib_dir from --local-dir +# - sourcebase directory relative to destdir where to place source code +# - files list of new files +func_emit_po_POTFILES_in () +{ + echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" + func_emit_copyright_notice + echo + echo "# List of files which contain translatable strings." + echo "$files" | sed -n -e "s,^lib/,$sourcebase/,p" +} + # func_emit_tests_Makefile_am # emits the contents of tests makefile to standard output. # Input: # - local_gnulib_dir from --local-dir # - modules list of modules, including dependencies # - libname library name +# - auxdir directory relative to destdir where to place build aux files # - makefile_name from --makefile-name # - libtool true if libtool will be used, false or blank otherwise # - sourcebase relative directory containing lib source code # - m4base relative directory containing autoconf macros # - testsbase relative directory containing unit test code +# - macro_prefix prefix of gl_LIBOBJS macros to use # - for_test true if creating a package for testing, false otherwise +# - use_libtests true if a libtests.a should be built, false otherwise +# Output: +# - uses_subdirs nonempty if object files in subdirs exist func_emit_tests_Makefile_am () { if test "$libtool" = true; then libext=la - else - libext=a - fi - if test "$libtool" = true; then - libext=la sed_eliminate_LDFLAGS= else libext=a @@ -1495,24 +1827,28 @@ func_emit_tests_Makefile_am () echo "## Process this file with automake to produce Makefile.in." func_emit_copyright_notice echo - # Generate dependencies here, since it eases the debugging of test failures. - echo "AUTOMAKE_OPTIONS = 1.5 foreign" - echo - echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}" - echo + uses_subdirs= ( for module in $modules; do - func_verify_tests_module + if $for_test; then + func_verify_tests_module + else + func_verify_module + fi if test -n "$module"; then { func_get_automake_snippet "$module" | sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \ -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \ -e "$sed_eliminate_LDFLAGS" \ - -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \ + -e 's,lib_\([A-Z][A-Z]*\),libtests_a_\1,g' \ -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \ -e "$sed_transform_check_PROGRAMS" + if $use_libtests && test "$module" = 'alloca'; then + echo "libtests_a_LIBADD += @${perhapsLT}ALLOCA@" + echo "libtests_a_DEPENDENCIES += @${perhapsLT}ALLOCA@" + fi } > amsnippet.tmp # Skip the contents if its entirely empty. if grep '[^ ]' amsnippet.tmp > /dev/null ; then @@ -1523,9 +1859,28 @@ func_emit_tests_Makefile_am () echo fi rm -f amsnippet.tmp + # Test whether there are some source files in subdirectories. + for f in `func_get_filelist "$module"`; do + case $f in + lib/*/*.c | tests/*/*.c) uses_subdirs=yes ;; + esac + done fi done ) > allsnippets.tmp + # Generate dependencies here, since it eases the debugging of test failures. + # If there are source files in subdirectories, prevent collision of the + # object files (example: hash.c and libxml/hash.c). + subdir_options= + if test -n "$uses_subdirs"; then + subdir_options=' subdir-objects' + fi + echo "AUTOMAKE_OPTIONS = 1.5 foreign${subdir_options}" + echo + if $for_test; then + echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}" + echo + fi # Nothing is being added to SUBDIRS; nevertheless the existence of this # variable is needed to avoid an error from automake: # "AM_GNU_GETTEXT used but SUBDIRS not defined" @@ -1537,6 +1892,16 @@ func_emit_tests_Makefile_am () echo "check_PROGRAMS =" fi echo "noinst_HEADERS =" + echo "noinst_LIBRARIES =" + if $use_libtests; then + if $for_test; then + echo "noinst_LIBRARIES += libtests.a" + else + echo "check_LIBRARIES = libtests.a" + fi + fi + # Automake versions < 1.9b create an empty pkgdatadir at installation time + # if you specify pkgdata_DATA to empty. This is a workaround. if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then echo "pkgdata_DATA =" fi @@ -1554,9 +1919,35 @@ func_emit_tests_Makefile_am () echo " -I${testsbase_inverse} -I\$(srcdir)/${testsbase_inverse} \\" echo " -I${testsbase_inverse}/${sourcebase-lib} -I\$(srcdir)/${testsbase_inverse}/${sourcebase-lib}" echo - echo "LDADD = ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}" + local_ldadd_before='' + local_ldadd_after='' + if $use_libtests; then + # All test programs need to be linked with libtests.a. + # It needs to be passed to the linker before ${libname}.${libext}, since + # the tests-related modules depend on the main modules. + # It also needs to be passed to the linker after ${libname}.${libext} + # because the latter might contain incomplete modules (such as the 'error' + # module whose dependency to 'progname' is voluntarily omitted). + # The LIBTESTS_LIBDEPS can be passed to the linker once or twice, it does + # not matter. + local_ldadd_before=' libtests.a' + local_ldadd_after=' libtests.a $(LIBTESTS_LIBDEPS)' + fi + echo "LDADD =${local_ldadd_before} ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}${local_ldadd_after}" echo - cat allsnippets.tmp + if $use_libtests; then + echo "libtests_a_SOURCES =" + # Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However, + # automake during its analyses looks for $(LIBOBJS), not for @LIBOBJS@. + echo "libtests_a_LIBADD = \$(${macro_prefix}tests_LIBOBJS)" + echo "libtests_a_DEPENDENCIES = \$(${macro_prefix}tests_LIBOBJS)" + echo "EXTRA_libtests_a_SOURCES =" + # The circular dependency in LDADD requires this. + echo "AM_LIBTOOLFLAGS = --preserve-dup-deps" + echo + fi + cat allsnippets.tmp \ + | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' echo "# Clean up after Solaris cc." echo "clean-local:" echo " rm -rf SunWS_cache" @@ -1566,102 +1957,134 @@ func_emit_tests_Makefile_am () echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\" echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" echo " fi; \\" - echo " done" + echo " done; \\" + echo " :" rm -f allsnippets.tmp } -# func_emit_initmacro_start +# func_emit_initmacro_start macro_prefix # emits the first few statements of the gl_INIT macro to standard output. # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use func_emit_initmacro_start () { + macro_prefix_arg="$1" # Overriding AC_LIBOBJ and AC_REPLACE_FUNCS has the effect of storing - # platform-dependent object files in ${macro_prefix}_LIBOBJS instead of + # platform-dependent object files in ${macro_prefix_arg}_LIBOBJS instead of # LIBOBJS. The purpose is to allow several gnulib instantiations under # a single configure.ac file. (AC_CONFIG_LIBOBJ_DIR does not allow this # flexibility.) # Furthermore it avoids an automake error like this when a Makefile.am # that uses pieces of gnulib also uses $(LIBOBJ): # automatically discovered file `error.c' should not be explicitly mentioned - echo " m4_pushdef([AC_LIBOBJ], m4_defn([${macro_prefix}_LIBOBJ]))" - echo " m4_pushdef([AC_REPLACE_FUNCS], m4_defn([${macro_prefix}_REPLACE_FUNCS]))" + echo " m4_pushdef([AC_LIBOBJ], m4_defn([${macro_prefix_arg}_LIBOBJ]))" + echo " m4_pushdef([AC_REPLACE_FUNCS], m4_defn([${macro_prefix_arg}_REPLACE_FUNCS]))" # Overriding AC_LIBSOURCES has the same purpose of avoiding the automake # error when a Makefile.am that uses pieces of gnulib also uses $(LIBOBJ): # automatically discovered file `error.c' should not be explicitly mentioned # We let automake know about the files to be distributed through the # EXTRA_lib_SOURCES variable. - echo " m4_pushdef([AC_LIBSOURCES], m4_defn([${macro_prefix}_LIBSOURCES]))" + echo " m4_pushdef([AC_LIBSOURCES], m4_defn([${macro_prefix_arg}_LIBSOURCES]))" } -# func_emit_initmacro_end +# func_emit_initmacro_end macro_prefix # emits the last few statements of the gl_INIT macro to standard output. # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use func_emit_initmacro_end () { + macro_prefix_arg="$1" echo " m4_popdef([AC_LIBSOURCES])" echo " m4_popdef([AC_REPLACE_FUNCS])" echo " m4_popdef([AC_LIBOBJ])" echo " AC_CONFIG_COMMANDS_PRE([" - echo " ${macro_prefix}_libobjs=" - echo " ${macro_prefix}_ltlibobjs=" - echo " if test -n \"\$${macro_prefix}_LIBOBJS\"; then" + echo " ${macro_prefix_arg}_libobjs=" + echo " ${macro_prefix_arg}_ltlibobjs=" + echo " if test -n \"\$${macro_prefix_arg}_LIBOBJS\"; then" echo " # Remove the extension." echo " sed_drop_objext='s/\\.o\$//;s/\\.obj\$//'" - echo " for i in \`for i in \$${macro_prefix}_LIBOBJS; do echo \"\$i\"; done | sed \"\$sed_drop_objext\" | sort | uniq\`; do" - echo " ${macro_prefix}_libobjs=\"\$${macro_prefix}_libobjs \$i.\$ac_objext\"" - echo " ${macro_prefix}_ltlibobjs=\"\$${macro_prefix}_ltlibobjs \$i.lo\"" + echo " for i in \`for i in \$${macro_prefix_arg}_LIBOBJS; do echo \"\$i\"; done | sed \"\$sed_drop_objext\" | sort | uniq\`; do" + echo " ${macro_prefix_arg}_libobjs=\"\$${macro_prefix_arg}_libobjs \$i.\$ac_objext\"" + echo " ${macro_prefix_arg}_ltlibobjs=\"\$${macro_prefix_arg}_ltlibobjs \$i.lo\"" echo " done" echo " fi" - echo " AC_SUBST([${macro_prefix}_LIBOBJS], [\$${macro_prefix}_libobjs])" - echo " AC_SUBST([${macro_prefix}_LTLIBOBJS], [\$${macro_prefix}_ltlibobjs])" + echo " AC_SUBST([${macro_prefix_arg}_LIBOBJS], [\$${macro_prefix_arg}_libobjs])" + echo " AC_SUBST([${macro_prefix_arg}_LTLIBOBJS], [\$${macro_prefix_arg}_ltlibobjs])" echo " ])" } -# func_emit_initmacro_done +# func_emit_initmacro_done macro_prefix sourcebase # emits a few statements after the gl_INIT macro to standard output. # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use +# - sourcebase directory relative to destdir where to place source code func_emit_initmacro_done () { + macro_prefix_arg="$1" + sourcebase_arg="$2" echo echo "# Like AC_LIBOBJ, except that the module name goes" - echo "# into ${macro_prefix}_LIBOBJS instead of into LIBOBJS." - echo "AC_DEFUN([${macro_prefix}_LIBOBJ]," - echo " [${macro_prefix}_LIBOBJS=\"\$${macro_prefix}_LIBOBJS \$1.\$ac_objext\"])" + echo "# into ${macro_prefix_arg}_LIBOBJS instead of into LIBOBJS." + echo "AC_DEFUN([${macro_prefix_arg}_LIBOBJ], [" + echo " AS_LITERAL_IF([\$1], [${macro_prefix_arg}_LIBSOURCES([\$1.c])])dnl" + echo " ${macro_prefix_arg}_LIBOBJS=\"\$${macro_prefix_arg}_LIBOBJS \$1.\$ac_objext\"" + echo "])" + echo + echo "# m4_foreach_w is provided by autoconf-2.59c and later." + echo "# This definition is to accommodate developers using versions" + echo "# of autoconf older than that." + echo "m4_ifndef([m4_foreach_w]," + echo " [m4_define([m4_foreach_w]," + echo " [m4_foreach([\$1], m4_split(m4_normalize([\$2]), [ ]), [\$3])])])" echo echo "# Like AC_REPLACE_FUNCS, except that the module name goes" - echo "# into ${macro_prefix}_LIBOBJS instead of into LIBOBJS." - echo "AC_DEFUN([${macro_prefix}_REPLACE_FUNCS]," - echo " [AC_CHECK_FUNCS([\$1], , [${macro_prefix}_LIBOBJ(\$ac_func)])])" + echo "# into ${macro_prefix_arg}_LIBOBJS instead of into LIBOBJS." + echo "AC_DEFUN([${macro_prefix_arg}_REPLACE_FUNCS], [" + echo " m4_foreach_w([gl_NAME], [\$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl" + echo " AC_CHECK_FUNCS([\$1], , [${macro_prefix_arg}_LIBOBJ(\$ac_func)])" + echo "])" echo - echo "# Like AC_LIBSOURCES, except that it does nothing." - echo "# We rely on EXTRA_lib..._SOURCES instead." - echo "AC_DEFUN([${macro_prefix}_LIBSOURCES]," - echo " [])" + echo "# Like AC_LIBSOURCES, except the directory where the source file is" + echo "# expected is derived from the gnulib-tool parametrization," + echo "# and alloca is special cased (for the alloca-opt module)." + echo "# We could also entirely rely on EXTRA_lib..._SOURCES." + echo "AC_DEFUN([${macro_prefix_arg}_LIBSOURCES], [" + echo " m4_foreach([_gl_NAME], [\$1], [" + echo " m4_if(_gl_NAME, [alloca.c], [], [" + echo " m4_syscmd([test -r $sourcebase_arg/]_gl_NAME[ || test ! -d $sourcebase_arg])dnl" + echo " m4_if(m4_sysval, [0], []," + echo " [AC_FATAL([missing $sourcebase_arg/]_gl_NAME)])" + echo " ])" + echo " ])" + echo "])" } # func_import modules # Uses also the variables # - destdir target directory # - local_gnulib_dir from --local-dir +# - verbose integer, default 0, inc/decremented by --verbose/--quiet # - libname library name # - sourcebase directory relative to destdir where to place source code # - m4base directory relative to destdir where to place *.m4 macros +# - pobase directory relative to destdir where to place *.po files # - docbase directory relative to destdir where to place doc files # - testsbase directory relative to destdir where to place unit test code # - auxdir directory relative to destdir where to place build aux files # - inctests true if --with-tests was given, blank otherwise # - avoidlist list of modules to avoid, from --avoid -# - lgpl true if library's license shall be LGPL, blank otherwise +# - lgpl yes or a number if library's license shall be LGPL, +# blank otherwise # - makefile_name from --makefile-name # - libtool true if --libtool was given, false if --no-libtool was # given, blank otherwise # - guessed_libtool true if the configure.ac file uses libtool, false otherwise # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use +# - po_domain prefix of i18n domain to use (without -gnulib suffix) # - autoconf_minversion minimum supported autoconf version # - doit : if actions shall be executed, false if only to be printed # - symbolic true if files should be symlinked, copied otherwise # - lsymbolic true if files from local_gnulib_dir should be symlinked, # copied otherwise +# - do_copyrights true if copyright notices in files should be replaced, +# blank otherwise func_import () { # Get the cached settings. @@ -1670,6 +2093,7 @@ func_import () cached_avoidlist= cached_sourcebase= cached_m4base= + cached_pobase= cached_docbase= cached_testsbase= cached_inctests= @@ -1678,6 +2102,7 @@ func_import () cached_makefile_name= cached_libtool= cached_macro_prefix= + cached_po_domain= cached_files= if test -f "$destdir"/$m4base/gnulib-cache.m4; then cached_libtool=false @@ -1700,6 +2125,9 @@ func_import () /gl_M4_BASE(/ { s,^.*gl_M4_BASE([[ ]*\([^])]*\).*$,cached_m4base="\1",p } + /gl_PO_BASE(/ { + s,^.*gl_PO_BASE([[ ]*\([^])]*\).*$,cached_pobase="\1",p + } /gl_DOC_BASE(/ { s,^.*gl_DOC_BASE([[ ]*\([^])]*\).*$,cached_docbase="\1",p } @@ -1712,8 +2140,11 @@ func_import () /gl_LIB(/ { s,^.*gl_LIB([[ ]*\([^])]*\).*$,cached_libname="\1",p } + /gl_LGPL(/ { + s,^.*gl_LGPL([[ ]*\([^])]*\).*$,cached_lgpl="\1",p + } /gl_LGPL/ { - s,^.*$,cached_lgpl=true,p + s,^.*$,cached_lgpl=yes,p } /gl_MAKEFILE_NAME(/ { s,^.*gl_MAKEFILE_NAME([[ ]*\([^])]*\).*$,cached_makefile_name="\1",p @@ -1723,6 +2154,9 @@ func_import () } /gl_MACRO_PREFIX(/ { s,^.*gl_MACRO_PREFIX([[ ]*\([^])]*\).*$,cached_macro_prefix="\1",p + } + /gl_PO_DOMAIN(/ { + s,^.*gl_PO_DOMAIN([[ ]*\([^])]*\).*$,cached_po_domain="\1",p }' eval `sed -n -e "$my_sed_traces" < "$destdir"/$m4base/gnulib-cache.m4` if test -f "$destdir"/$m4base/gnulib-comp.m4; then @@ -1775,7 +2209,9 @@ func_import () specified_modules="$cached_specified_modules $1" # Append the cached and the specified avoidlist. This is probably better # than dropping the cached one when --avoid is specified at least once. - avoidlist=`echo $cached_avoidlist $avoidlist` + avoidlist=`for m in $cached_avoidlist $avoidlist; do echo $m; done | LC_ALL=C sort -u` + avoidlist=`echo $avoidlist` + # The sourcebase defaults to the cached one. if test -z "$sourcebase"; then sourcebase="$cached_sourcebase" @@ -1783,6 +2219,10 @@ func_import () func_fatal_error "missing --source-base option" fi fi + # The pobase defaults to the cached one. + if test -z "$pobase"; then + pobase="$cached_pobase" + fi # The docbase defaults to the cached one. if test -z "$docbase"; then docbase="$cached_docbase" @@ -1831,6 +2271,10 @@ func_import () func_fatal_error "missing --macro-prefix option" fi fi + # The po_domain defaults to the cached one. + if test -z "$po_domain"; then + po_domain="$cached_po_domain" + fi # Canonicalize the list of specified modules. specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort -u` @@ -1838,27 +2282,104 @@ func_import () # Determine final module list. modules="$specified_modules" func_modules_transitive_closure - echo "Module list with included dependencies:" - echo "$modules" | sed -e 's/^/ /' + if test $verbose -ge 0; then + echo "Module list with included dependencies:" + echo "$modules" | sed -e 's/^/ /' + fi + final_modules="$modules" + + # Determine main module list and tests-related module list separately. + # The main module list is the transitive closure of the specified modules, + # ignoring tests modules. Its lib/* sources go into $sourcebase/. If --lgpl + # is specified, it will consist only of LGPLed source. + # The tests-related module list is the transitive closure of the specified + # modules, including tests modules, minus the main module list. Its lib/* + # sources (brought in through dependencies of *-tests modules) go into + # $testsbase/. It may contain GPLed source, even if --lgpl is specified. + # Determine main module list. + saved_inctests="$inctests" + inctests="" + modules="$specified_modules" + func_modules_transitive_closure + main_modules="$modules" + inctests="$saved_inctests" + if test $verbose -ge 1; then + echo "Main module list:" + echo "$main_modules" | sed -e 's/^/ /' + fi + # Determine tests-related module list. + echo "$final_modules" | LC_ALL=C sort -u > "$tmp"/final-modules + testsrelated_modules=`echo "$main_modules" | LC_ALL=C sort -u | LC_ALL=C join -v 2 - "$tmp"/final-modules` + if test $verbose -ge 1; then + echo "Tests-related module list:" + echo "$testsrelated_modules" | sed -e 's/^/ /' + fi - # Add the dummy module if needed. + # Add the dummy module to the main module list if needed. + modules="$main_modules" func_modules_add_dummy + main_modules="$modules" + + # Determine whether a $testsbase/libtests.a is needed. + use_libtests=false + for module in $testsrelated_modules; do + func_verify_nontests_module + if test -n "$module"; then + all_files=`func_get_filelist $module` + lib_files=`for f in $all_files; do \ + case $f in \ + lib/*) echo $f ;; \ + esac; \ + done | sed -e 's,^lib/,,'` + if test -n "$lib_files"; then + use_libtests=true + break + fi + fi + done + + # Add the dummy module to the tests-related module list if needed. + if $use_libtests; then + modules="$testsrelated_modules" + func_modules_add_dummy + testsrelated_modules="$modules" + fi # If --lgpl, verify that the licenses of modules are compatible. if test -n "$lgpl"; then - for module in $modules; do + for module in $main_modules; do license=`func_get_license $module` case $license in - LGPL | 'GPLed build tool') ;; + 'GPLed build tool') ;; 'public domain' | 'unlimited' | 'unmodifiable license text') ;; - *) func_fatal_error "incompatible license on module $module: $license" ;; + *) + case "$lgpl" in + yes | 3) + case $license in + LGPL | LGPLv2+) ;; + *) func_fatal_error "incompatible license on module $module: $license" ;; + esac + ;; + 2) + case $license in + LGPLv2+) ;; + *) func_fatal_error "incompatible license on module $module: $license" ;; + esac + ;; + *) func_fatal_error "invalid value lgpl=$lgpl" ;; + esac + ;; esac done fi + # Show banner notice of every module. + modules="$main_modules" + func_modules_notice + # Determine script to apply to imported library files. sed_transform_lib_file= - for module in $modules; do + for module in $main_modules; do if test $module = config-h; then # Assume config.h exists, and that -DHAVE_CONFIG_H is omitted. sed_transform_lib_file=$sed_transform_lib_file' @@ -1867,18 +2388,66 @@ func_import () break fi done - if test -n "$lgpl"; then + sed_transform_main_lib_file="$sed_transform_lib_file" + if test -n "$do_copyrights"; then + if test -n "$lgpl"; then + # Update license. + case "$lgpl" in + yes | 3) + sed_transform_main_lib_file=$sed_transform_main_lib_file' + s/GNU General/GNU Lesser General/g + ' + ;; + 2) + sed_transform_main_lib_file=$sed_transform_main_lib_file' + s/GNU General/GNU Lesser General/g + s/version [23]\([ ,]\)/version 2.1\1/g + ' + ;; + *) func_fatal_error "invalid value lgpl=$lgpl" ;; + esac + else + # Update license. + sed_transform_main_lib_file=$sed_transform_main_lib_file' + s/GNU Lesser General/GNU General/g + s/GNU Library General/GNU General/g + s/version \(2\|2\.1\)\([ ,]\)/version 3\2/g + ' + fi + fi + + # Determine script to apply to library files that go into $testsbase/. + sed_transform_testsrelated_lib_file="$sed_transform_lib_file" + if test -n "$do_copyrights"; then # Update license. - sed_transform_lib_file=$sed_transform_lib_file' - s/GNU General/GNU Lesser General/g - s/version 2\([ ,]\)/version 2.1\1/g + sed_transform_testsrelated_lib_file=$sed_transform_testsrelated_lib_file' + s/GNU Lesser General/GNU General/g + s/GNU Library General/GNU General/g + s/version \(2\|2\.1\)\([ ,]\)/version 3\2/g ' fi - # Determine final file list. + # Determine the final file lists. + # They must be computed separately, because files in lib/* go into + # $sourcebase/ if they are in the main file list but into $testsbase/ + # if they are in the tests-related file list. Furthermore lib/dummy.c + # can be in both. + # Determine final main file list. + modules="$main_modules" + func_modules_to_filelist + main_files="$files" + # Determine final tests-related file list. + modules="$testsrelated_modules" func_modules_to_filelist - echo "File list:" - echo "$files" | sed -e 's/^/ /' + testsrelated_files=`echo "$files" | sed -e 's,^lib/,tests=lib/,'` + # Merge both file lists. + sed_remove_empty_lines='/^$/d' + files=`{ echo "$main_files"; echo "$testsrelated_files"; } | sed -e "$sed_remove_empty_lines" | LC_ALL=C sort -u` + if test $verbose -ge 0; then + echo "File list:" + sed_prettyprint_files='s,^tests=lib/\(.*\)$,lib/\1 -> tests/\1,' + echo "$files" | sed -e "$sed_prettyprint_files" -e 's/^/ /' + fi test -n "$files" \ || func_fatal_error "refusing to do nothing" @@ -1895,17 +2464,22 @@ func_import () s,^doc/,$cached_docbase/, s,^lib/,$cached_sourcebase/, s,^m4/,$cached_m4base/, - s,^tests/,$cached_testsbase/," + s,^tests/,$cached_testsbase/, + s,^tests=lib/,$cached_testsbase/," sed_rewrite_new_files="\ s,^build-aux/,$auxdir/, s,^doc/,$docbase/, s,^lib/,$sourcebase/, s,^m4/,$m4base/, - s,^tests/,$testsbase/," + s,^tests/,$testsbase/, + s,^tests=lib/,$testsbase/," # Create directories. { echo "$sourcebase" echo "$m4base" + if test -n "$pobase"; then + echo "$pobase" + fi docfiles=`echo "$files" | sed -n -e 's,^doc/,,p'` if test -n "$docfiles"; then echo "$docbase" @@ -1972,7 +2546,7 @@ func_import () sed_take_first_column='s,'"$delimiter"'.*,,' for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_first_column"`; do # Remove the file. Do nothing if the user already removed it. - if test -f "$destdir/$g"; then + if test -f "$destdir/$g" || test -h "$destdir/$g"; then if $doit; then echo "Removing file $g (backup in ${g}~)" mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed" @@ -1989,13 +2563,25 @@ func_import () # - already_present nonempty if the file already exists, empty otherwise func_add_or_update () { + of="$f" + case "$f" in + tests=lib/*) f=`echo "$f" | sed -e 's,^tests=lib/,lib/,'` ;; + esac func_dest_tmpfilename "$g" func_lookup_file "$f" cp "$lookedup_file" "$tmpfile" || func_fatal_error "failed" - if test -n "$sed_transform_lib_file"; then - case "$f" in + if test -n "$sed_transform_main_lib_file"; then + case "$of" in lib/*) - sed -e "$sed_transform_lib_file" \ + sed -e "$sed_transform_main_lib_file" \ + < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" + ;; + esac + fi + if test -n "$sed_transform_testsrelated_lib_file"; then + case "$of" in + tests=lib/*) + sed -e "$sed_transform_testsrelated_lib_file" \ < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" ;; esac @@ -2089,6 +2675,9 @@ func_import () func_append actioncmd " --lib=$libname" func_append actioncmd " --source-base=$sourcebase" func_append actioncmd " --m4-base=$m4base" + if test -n "$pobase"; then + func_append actioncmd " --po-base=$pobase" + fi func_append actioncmd " --doc-base=$docbase" func_append actioncmd " --aux-dir=$auxdir" if test -n "$inctests"; then @@ -2098,7 +2687,11 @@ func_import () func_append actioncmd " --avoid=$module" done if test -n "$lgpl"; then - func_append actioncmd " --lgpl" + if test "$lgpl" = yes; then + func_append actioncmd " --lgpl" + else + func_append actioncmd " --lgpl=$lgpl" + fi fi if test -n "$makefile_name"; then func_append actioncmd " --makefile-name=$makefile_name" @@ -2109,6 +2702,9 @@ func_import () func_append actioncmd " --no-libtool" fi func_append actioncmd " --macro-prefix=$macro_prefix" + if test -n "$po_domain"; then + func_append actioncmd " --po-domain=$po_domain" + fi func_append actioncmd " `echo $specified_modules`" # Default the makefile name to Makefile.am. @@ -2123,6 +2719,7 @@ func_import () # Create library makefile. func_dest_tmpfilename $sourcebase/$makefile_am + modules="$main_modules" func_emit_lib_Makefile_am > "$tmpfile" if test -f "$destdir"/$sourcebase/$makefile_am; then if cmp "$destdir"/$sourcebase/$makefile_am "$tmpfile" > /dev/null; then @@ -2148,6 +2745,137 @@ func_import () func_append added_files "$sourcebase/$makefile_am$nl" fi + # Create po/ directory. + if test -n "$pobase"; then + # Create po makefile and auxiliary files. + for file in Makefile.in.in remove-potcdate.sin; do + func_dest_tmpfilename $pobase/$file + func_lookup_file build-aux/po/$file + cat "$lookedup_file" > "$tmpfile" + if test -f "$destdir"/$pobase/$file; then + if cmp "$destdir"/$pobase/$file "$tmpfile" > /dev/null; then + rm -f "$tmpfile" + else + if $doit; then + echo "Updating $pobase/$file (backup in $pobase/$file~)" + mv -f "$destdir"/$pobase/$file "$destdir"/$pobase/$file~ + mv -f "$tmpfile" "$destdir"/$pobase/$file + else + echo "Update $pobase/$file (backup in $pobase/$file~)" + rm -f "$tmpfile" + fi + fi + else + if $doit; then + echo "Creating $pobase/$file" + mv -f "$tmpfile" "$destdir"/$pobase/$file + else + echo "Create $pobase/$file" + rm -f "$tmpfile" + fi + func_append added_files "$pobase/$file$nl" + fi + done + # Create po makefile parametrization, part 1. + func_dest_tmpfilename $pobase/Makevars + func_emit_po_Makevars > "$tmpfile" + if test -f "$destdir"/$pobase/Makevars; then + if cmp "$destdir"/$pobase/Makevars "$tmpfile" > /dev/null; then + rm -f "$tmpfile" + else + if $doit; then + echo "Updating $pobase/Makevars (backup in $pobase/Makevars~)" + mv -f "$destdir"/$pobase/Makevars "$destdir"/$pobase/Makevars~ + mv -f "$tmpfile" "$destdir"/$pobase/Makevars + else + echo "Update $pobase/Makevars (backup in $pobase/Makevars~)" + rm -f "$tmpfile" + fi + fi + else + if $doit; then + echo "Creating $pobase/Makevars" + mv -f "$tmpfile" "$destdir"/$pobase/Makevars + else + echo "Create $pobase/Makevars" + rm -f "$tmpfile" + fi + func_append added_files "$pobase/Makevars$nl" + fi + # Create po makefile parametrization, part 2. + func_dest_tmpfilename $pobase/POTFILES.in + func_emit_po_POTFILES_in > "$tmpfile" + if test -f "$destdir"/$pobase/POTFILES.in; then + if cmp "$destdir"/$pobase/POTFILES.in "$tmpfile" > /dev/null; then + rm -f "$tmpfile" + else + if $doit; then + echo "Updating $pobase/POTFILES.in (backup in $pobase/POTFILES.in~)" + mv -f "$destdir"/$pobase/POTFILES.in "$destdir"/$pobase/POTFILES.in~ + mv -f "$tmpfile" "$destdir"/$pobase/POTFILES.in + else + echo "Update $pobase/POTFILES.in (backup in $pobase/POTFILES.in~)" + rm -f "$tmpfile" + fi + fi + else + if $doit; then + echo "Creating $pobase/POTFILES.in" + mv -f "$tmpfile" "$destdir"/$pobase/POTFILES.in + else + echo "Create $pobase/POTFILES.in" + rm -f "$tmpfile" + fi + func_append added_files "$pobase/POTFILES.in$nl" + fi + # Fetch PO files. + TP_URL="http://translationproject.org/latest/" + TP_RSYNC_URI="translationproject.org::tp/latest/" + if $doit; then + echo "Fetching gnulib PO files from $TP_URL" + (cd "$destdir"/$pobase \ + && { # Prefer rsync over wget if it is available, since it consumes + # less network bandwidth, due to compression. + if type rsync 2>/dev/null | grep / > /dev/null; then + rsync -Lrtz "${TP_RSYNC_URI}gnulib/" . + else + wget --quiet -r -l1 -nd -np -A.po "${TP_URL}gnulib" + fi + } + ) + else + echo "Fetch gnulib PO files from $TP_URL" + fi + # Create po/LINGUAS. + if $doit; then + func_dest_tmpfilename $pobase/LINGUAS + (cd "$destdir"/$pobase \ + && { echo '# Set of available languages.' + LC_ALL=C ls -1 *.po | sed -e 's,\.po$,,' + } + ) > "$tmpfile" + if test -f "$destdir"/$pobase/LINGUAS; then + if cmp "$destdir"/$pobase/LINGUAS "$tmpfile" > /dev/null; then + rm -f "$tmpfile" + else + echo "Updating $pobase/LINGUAS (backup in $pobase/LINGUAS~)" + mv -f "$destdir"/$pobase/LINGUAS "$destdir"/$pobase/LINGUAS~ + mv -f "$tmpfile" "$destdir"/$pobase/LINGUAS + fi + else + echo "Creating $pobase/LINGUAS" + mv -f "$tmpfile" "$destdir"/$pobase/LINGUAS + func_append added_files "$pobase/LINGUAS$nl" + fi + else + if test -f "$destdir"/$pobase/LINGUAS; then + echo "Update $pobase/LINGUAS (backup in $pobase/LINGUAS~)" + else + echo "Create $pobase/LINGUAS" + fi + fi + fi + # Create m4/gnulib-cache.m4. func_dest_tmpfilename $m4base/gnulib-cache.m4 ( @@ -2181,16 +2909,24 @@ func_import () echo "gl_AVOID([$avoidlist])" echo "gl_SOURCE_BASE([$sourcebase])" echo "gl_M4_BASE([$m4base])" + echo "gl_PO_BASE([$pobase])" echo "gl_DOC_BASE([$docbase])" echo "gl_TESTS_BASE([$testsbase])" test -z "$inctests" || echo "gl_WITH_TESTS" echo "gl_LIB([$libname])" - test -z "$lgpl" || echo "gl_LGPL" + if test -n "$lgpl"; then + if test "$lgpl" = yes; then + echo "gl_LGPL" + else + echo "gl_LGPL([$lgpl])" + fi + fi echo "gl_MAKEFILE_NAME([$makefile_name])" if test "$libtool" = true; then echo "gl_LIBTOOL" fi echo "gl_MACRO_PREFIX([$macro_prefix])" + echo "gl_PO_DOMAIN([$po_domain])" ) > "$tmpfile" if test -f "$destdir"/$m4base/gnulib-cache.m4; then if cmp "$destdir"/$m4base/gnulib-cache.m4 "$tmpfile" > /dev/null; then @@ -2249,7 +2985,7 @@ func_import () if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then echo " AC_REQUIRE([AC_GNU_SOURCE])" fi - for module in $modules; do + for module in $final_modules; do func_verify_module if test -n "$module"; then func_get_autoconf_early_snippet "$module" @@ -2262,7 +2998,6 @@ func_import () echo "# \"Check for header files, types and library functions\"." echo "AC_DEFUN([${macro_prefix}_INIT]," echo "[" - func_emit_initmacro_start if test "$libtool" = true; then echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" echo " gl_cond_libtool=true" @@ -2272,7 +3007,6 @@ func_import () echo " gl_libdeps=" echo " gl_ltlibdeps=" fi - echo " gl_source_base='$sourcebase'" if test "$auxdir" != "build-aux"; then sed_replace_build_aux=' :a @@ -2283,7 +3017,9 @@ func_import () else sed_replace_build_aux= fi - for module in $modules; do + func_emit_initmacro_start $macro_prefix + echo " gl_source_base='$sourcebase'" + for module in $main_modules; do func_verify_module if test -n "$module"; then func_get_autoconf_snippet "$module" \ @@ -2298,18 +3034,40 @@ func_import () fi fi done + func_emit_initmacro_end $macro_prefix + echo " gltests_libdeps=" + echo " gltests_ltlibdeps=" + func_emit_initmacro_start ${macro_prefix}tests + echo " gl_source_base='$testsbase'" + for module in $testsrelated_modules; do + func_verify_module + if test -n "$module"; then + func_get_autoconf_snippet "$module" \ + | sed -e '/^$/d;' -e 's/^/ /' \ + -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./' \ + -e "$sed_replace_build_aux" \ + -e 's/\$gl_cond_libtool/false/g' \ + -e 's/gl_libdeps/gltests_libdeps/g' \ + -e 's/gl_ltlibdeps/gltests_ltlibdeps/g' + fi + done + func_emit_initmacro_end ${macro_prefix}tests # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. if test "$libtool" != true; then - libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'` + libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z-' 'A-Z_'` echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" echo " AC_SUBST([${libname_upper}_LIBDEPS])" echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" fi - func_emit_initmacro_end + if $use_libtests; then + echo " LIBTESTS_LIBDEPS=\"\$gltests_libdeps\"" + echo " AC_SUBST([LIBTESTS_LIBDEPS])" + fi echo "])" - func_emit_initmacro_done + func_emit_initmacro_done $macro_prefix $sourcebase + func_emit_initmacro_done ${macro_prefix}tests $testsbase echo echo "# This macro records the list of files which have been installed by" echo "# gnulib-tool and may be removed by future gnulib-tool invocations." @@ -2349,6 +3107,7 @@ func_import () if test -n "$inctests"; then # Create tests makefile. func_dest_tmpfilename $testsbase/$makefile_am + modules="$testsrelated_modules" func_emit_tests_Makefile_am > "$tmpfile" if test -f "$destdir"/$testsbase/$makefile_am; then if cmp "$destdir"/$testsbase/$makefile_am "$tmpfile" > /dev/null; then @@ -2409,7 +3168,14 @@ func_import () if test -n "$dir_added"; then if $doit; then echo "Creating $destdir/$dir$ignore" - echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u > "$destdir/$dir$ignore" + { + if test "$ignore" = .cvsignore; then + echo ".deps" + # Automake generates Makefile rules that create .dirstamp files. + echo ".dirstamp" + fi + echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u + } > "$destdir/$dir$ignore" else echo "Create $destdir/$dir$ignore" fi @@ -2421,7 +3187,7 @@ func_import () dir="$1" dir_added="$2" dir_removed="$3" - if test -d "$destdir/${dir}CVS" || test -f "$destdir/${dir}.cvsignore"; then + if test -d "$destdir/CVS" || test -d "$destdir/${dir}CVS" || test -f "$destdir/${dir}.cvsignore"; then func_update_ignorelist .cvsignore fi if test -d "$destdir/.git" || test -f "$destdir/${dir}.gitignore"; then @@ -2454,13 +3220,13 @@ func_import () echo "Finished." echo echo "You may need to add #include directives for the following .h files." - # Intersect $specified_modules and $modules - # (since $specified_modules is not necessarily of subset of $modules - some - # may have been skipped through --avoid, and since the elements of $modules - # but not in $specified_modules can go away without explicit notice - through - # changes in the module dependencies). + # Intersect $specified_modules and $main_modules + # (since $specified_modules is not necessarily of subset of $main_modules + # - some may have been skipped through --avoid, and since the elements of + # $main_modules but not in $specified_modules can go away without explicit + # notice - through changes in the module dependencies). echo "$specified_modules" > "$tmp"/modules1 # a sorted list, one module per line - echo "$modules" > "$tmp"/modules2 # also a sorted list, one module per line + echo "$main_modules" > "$tmp"/modules2 # also a sorted list, one module per line # First the #include <...> directives without #ifs, sorted for convenience, # then the #include "..." directives without #ifs, sorted for convenience, # then the #include directives that are surrounded by #ifs. Not sorted. @@ -2483,7 +3249,7 @@ func_import () ) | sed -e '/^$/d' -e 's/^/ /' rm -f "$tmp"/include-angles "$tmp"/include-quotes "$tmp"/include-if - for module in $modules; do + for module in $main_modules; do func_get_link_directive "$module" done \ | LC_ALL=C sort -u | sed -e '/^$/d' -e 's/^/ /' > "$tmp"/link @@ -2503,6 +3269,9 @@ func_import () else echo " - \"include $makefile_name\" from within \"$sourcebase/Makefile.am\"," fi + if test -n "$pobase"; then + echo " - add \"$pobase/Makefile.in\" to AC_CONFIG_FILES in $configure_ac," + fi if test -n "$inctests"; then if test "$makefile_am" = Makefile.am; then echo " - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in $configure_ac," @@ -2515,6 +3284,11 @@ func_import () sourcebase_base=`basename "$sourcebase"` echo " - mention \"${sourcebase_base}\" in SUBDIRS in ${sourcebase_dir}Makefile.am," fi + if test -n "$pobase"; then + pobase_dir=`echo "$pobase" | sed -n -e 's,/[^/]*$,/,p'` + pobase_base=`basename "$pobase"` + echo " - mention \"${pobase_base}\" in SUBDIRS in ${pobase_dir}Makefile.am," + fi if test -n "$inctests"; then if test "$makefile_am" = Makefile.am; then testsbase_dir=`echo "$testsbase" | sed -n -e 's,/[^/]*$,/,p'` @@ -2564,10 +3338,31 @@ func_create_testdir () func_modules_transitive_closure for module in $modules; do license=`func_get_license "$module"` - case $license in - LGPL | 'GPLed build tool') ;; + case "$license" in + 'GPLed build tool') ;; 'public domain' | 'unlimited' | 'unmodifiable license text') ;; - *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + *) + case "$requested_license" in + GPLv2+) + case "$license" in + GPLv2+ | LGPLv2+) ;; + *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + esac + ;; + LGPL) + case "$license" in + LGPL | LGPLv2+) ;; + *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + esac + ;; + LGPLv2+) + case "$license" in + LGPLv2+) ;; + *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + esac + ;; + esac + ;; esac done fi @@ -2578,22 +3373,31 @@ func_create_testdir () # Subdirectory names. sourcebase=gllib m4base=glm4 + pobase= docbase=gldoc testsbase=gltests macro_prefix=gl + po_domain= # Determine final module list. func_modules_transitive_closure - echo "Module list with included dependencies:" - echo "$modules" | sed -e 's/^/ /' + if test $verbose -ge 0; then + echo "Module list with included dependencies:" + echo "$modules" | sed -e 's/^/ /' + fi # Add the dummy module if needed. func_modules_add_dummy + # Show banner notice of every module. + func_modules_notice + # Determine final file list. func_modules_to_filelist - echo "File list:" - echo "$files" | sed -e 's/^/ /' + if test $verbose -ge 0; then + echo "File list:" + echo "$files" | sed -e 's/^/ /' + fi sed_rewrite_files="\ s,^build-aux/,$auxdir/, @@ -2650,6 +3454,7 @@ func_create_testdir () # Create $sourcebase/Makefile.am. mkdir -p "$testdir/$sourcebase" func_emit_lib_Makefile_am > "$testdir/$sourcebase/Makefile.am" + any_uses_subdirs="$uses_subdirs" # Create $m4base/Makefile.am. mkdir -p "$testdir/$m4base" @@ -2678,12 +3483,17 @@ func_create_testdir () if test -n "$inctests"; then test -d "$testdir/$testsbase" || mkdir "$testdir/$testsbase" + # Viewed from the $testsbase subdirectory, $auxdir is different. + saved_auxdir="$auxdir" + auxdir=`echo "$testsbase/"|sed 's%[^/][^/]*//*%../%g'`"$auxdir" # Create $testsbase/Makefile.am. + use_libtests=false func_emit_tests_Makefile_am > "$testdir/$testsbase/Makefile.am" + any_uses_subdirs="$any_uses_subdirs$uses_subdirs" # Create $testsbase/configure.ac. (echo "# Process this file with autoconf to produce a configure script." echo "AC_INIT([dummy], [0])" - echo "AC_CONFIG_AUX_DIR([../$auxdir])" + echo "AC_CONFIG_AUX_DIR([$auxdir])" echo "AM_INIT_AUTOMAKE" echo echo "AM_CONFIG_HEADER([config.h])" @@ -2721,13 +3531,13 @@ func_create_testdir () # expansion of the required macro before the current point, and only one # expansion total). echo "AC_DEFUN([gl_INIT], [" - func_emit_initmacro_start sed_replace_build_aux=' :a /AC_CONFIG_FILES(.*:build-aux\/.*)/{ - s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)| - ba + s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| + ba }' + func_emit_initmacro_start $macro_prefix # We don't have explicit ordering constraints between the various # autoconf snippets. It's cleanest to put those of the library before # those of the tests. @@ -2747,18 +3557,18 @@ func_create_testdir () | sed -e "$sed_replace_build_aux" fi done + func_emit_initmacro_end $macro_prefix # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. if test "$libtool" != true; then - libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'` + libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z-' 'A-Z_'` echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" echo " AC_SUBST([${libname_upper}_LIBDEPS])" echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" fi - func_emit_initmacro_end echo "])" - func_emit_initmacro_done + func_emit_initmacro_done $macro_prefix $sourcebase # FIXME use $sourcebase or $testsbase? echo echo "gl_INIT" echo @@ -2768,6 +3578,7 @@ func_create_testdir () echo echo "AC_OUTPUT([Makefile])" ) > "$testdir/$testsbase/configure.ac" + auxdir="$saved_auxdir" func_append subdirs " $testsbase" subdirs_with_configure_ac="$subdirs_with_configure_ac $testsbase" fi @@ -2807,7 +3618,7 @@ func_create_testdir () echo echo "AC_PROG_RANLIB" echo - if test -n "$uses_subdirs"; then + if test -n "$any_uses_subdirs"; then echo "AM_PROG_CC_C_O" echo fi @@ -2831,7 +3642,6 @@ func_create_testdir () echo "gl_libdeps=" echo "gl_ltlibdeps=" fi - echo "gl_source_base='$sourcebase'" # Wrap the set of autoconf snippets into an autoconf macro that is then # invoked. This is needed because autoconf does not support AC_REQUIRE # at the top level: @@ -2840,7 +3650,6 @@ func_create_testdir () # expansion of the required macro before the current point, and only one # expansion total). echo "AC_DEFUN([gl_INIT], [" - func_emit_initmacro_start if test "$auxdir" != "build-aux"; then sed_replace_build_aux=' :a @@ -2851,6 +3660,8 @@ func_create_testdir () else sed_replace_build_aux= fi + func_emit_initmacro_start $macro_prefix + echo "gl_source_base='$sourcebase'" for module in $modules; do func_verify_nontests_module if test -n "$module"; then @@ -2858,18 +3669,18 @@ func_create_testdir () | sed -e "$sed_replace_build_aux" fi done + func_emit_initmacro_end $macro_prefix # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. if test "$libtool" != true; then - libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'` + libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z-' 'A-Z_'` echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" echo " AC_SUBST([${libname_upper}_LIBDEPS])" echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" fi - func_emit_initmacro_end echo "])" - func_emit_initmacro_done + func_emit_initmacro_done $macro_prefix $sourcebase echo echo "gl_INIT" echo @@ -2893,24 +3704,18 @@ func_create_testdir () # Do not use "${AUTORECONF} --force --install", because it may invoke # autopoint, which brings in older versions of some of our .m4 files. if test -f $m4base/gettext.m4; then - echo "executing ${AUTOPOINT} --force" - ${AUTOPOINT} --force || func_exit 1 + func_execute_command ${AUTOPOINT} --force || func_exit 1 for f in $m4base/*.m4~; do mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1 done fi - echo "executing ${ACLOCAL} -I $m4base" - ${ACLOCAL} -I $m4base || func_exit 1 + func_execute_command ${ACLOCAL} -I $m4base || func_exit 1 if ! test -d build-aux; then - echo "executing mkdir build-aux" - mkdir build-aux || func_exit 1 + func_execute_command mkdir build-aux || func_exit 1 fi - echo "executing ${AUTOCONF}" - ${AUTOCONF} || func_exit 1 - echo "executing ${AUTOHEADER}" - ${AUTOHEADER} || func_exit 1 - echo "executing ${AUTOMAKE} --add-missing --copy" - ${AUTOMAKE} --add-missing --copy || func_exit 1 + func_execute_command ${AUTOCONF} || func_exit 1 + func_execute_command ${AUTOHEADER} || func_exit 1 + func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1 ) || func_exit 1 if test -n "$inctests"; then # Create autogenerated files. @@ -2918,24 +3723,18 @@ func_create_testdir () # Do not use "${AUTORECONF} --force --install", because it may invoke # autopoint, which brings in older versions of some of our .m4 files. if test -f ../$m4base/gettext.m4; then - echo "executing ${AUTOPOINT} --force" - ${AUTOPOINT} --force || func_exit 1 + func_execute_command ${AUTOPOINT} --force || func_exit 1 for f in ../$m4base/*.m4~; do - mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1 + mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1 done fi - echo "executing ${ACLOCAL} -I ../$m4base" - ${ACLOCAL} -I ../$m4base || func_exit 1 + func_execute_command ${ACLOCAL} -I ../$m4base || func_exit 1 if ! test -d ../build-aux; then - echo "executing mkdir ../build-aux" - mkdir ../build-aux + func_execute_command mkdir ../build-aux fi - echo "executing ${AUTOCONF}" - ${AUTOCONF} || func_exit 1 - echo "executing ${AUTOHEADER}" - ${AUTOHEADER} || func_exit 1 - echo "executing ${AUTOMAKE} --add-missing --copy" - ${AUTOMAKE} --add-missing --copy || func_exit 1 + func_execute_command ${AUTOCONF} || func_exit 1 + func_execute_command ${AUTOHEADER} || func_exit 1 + func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1 ) || func_exit 1 fi # Need to run configure and make once, to create built files that are to be @@ -2994,7 +3793,12 @@ func_create_megatestdir () func_append megasubdirs "ALL" # Create autobuild. - cvsdate=`sh "$gnulib_dir/build-aux/mdate-sh" "$gnulib_dir/CVS/Entries" \ + cvsdate=`if test -f "$gnulib_dir/CVS/Entries"; then \ + vc_witness="$gnulib_dir/CVS/Entries"; \ + else \ + vc_witness="$gnulib_dir/.git/refs/heads/master"; \ + fi; \ + sh "$gnulib_dir/build-aux/mdate-sh" "$vc_witness" \ | sed -e 's,January,01,' -e 's,Jan,01,' \ -e 's,February,02,' -e 's,Feb,02,' \ -e 's,March,03,' -e 's,Mar,03,' \ @@ -3007,7 +3811,7 @@ func_create_megatestdir () -e 's,October,10,' -e 's,Oct,10,' \ -e 's,November,11,' -e 's,Nov,11,' \ -e 's,December,12,' -e 's,Dec,12,' \ - -e 's,^,00,' -e 's,^[0-9]*\([0-9][0-9] \),\1,' \ + -e 's,^,00,' -e 's,^[0-9]*\([0-9][0-9] \),\1,' \ -e 's,^\([0-9]*\) \([0-9]*\) \([0-9]*\),\3\2\1,'` (echo '#!/bin/sh' echo "CVSDATE=$cvsdate" @@ -3058,14 +3862,10 @@ func_create_megatestdir () # Do not use "${AUTORECONF} --install", because autoreconf operates # recursively, but the subdirectories are already finished, therefore # calling autoreconf here would only waste lots of CPU time. - echo "executing ${ACLOCAL}" - ${ACLOCAL} || func_exit 1 - echo "executing mkdir build-aux" - mkdir build-aux - echo "executing ${AUTOCONF}" - ${AUTOCONF} || func_exit 1 - echo "executing ${AUTOMAKE} --add-missing --copy" - ${AUTOMAKE} --add-missing --copy || func_exit 1 + func_execute_command ${ACLOCAL} || func_exit 1 + func_execute_command mkdir build-aux + func_execute_command ${AUTOCONF} || func_exit 1 + func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1 ) || func_exit 1 } @@ -3194,9 +3994,9 @@ case $mode in for m4base in $m4dirs; do # Perform func_import in a subshell, so that variable values # such as - # local_gnulib_dir, avoidlist, sourcebase, m4base, docbase, - # testsbase, inctests, libname, lgpl, makefile_name, libtool, - # macro_prefix + # local_gnulib_dir, avoidlist, sourcebase, m4base, pobase, + # docbase, testsbase, inctests, libname, lgpl, makefile_name, + # libtool, macro_prefix, po_domain # don't propagate from one directory to another. (func_import) || func_exit 1 done @@ -3285,6 +4085,16 @@ case $mode in done ;; + extract-notice ) + for module + do + func_verify_module + if test -n "$module"; then + func_get_notice "$module" + fi + done + ;; + extract-filelist ) for module do