X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=669931c034ed19b656276a09e48d524dbd044541;hb=23eecb48e39afd0d267d64d40ba6bf97aa865e13;hp=ddc0574e6ddb629ef80c5e50183f2900c0849e46;hpb=f082e5ae15df5292308eac1d3409f086985d3e08;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index ddc0574e6..669931c03 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2002-2010 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # 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 @@ -109,10 +109,10 @@ fi sed_noop='s,x,x,' # sed_comments is true or false, depending whether 'sed' supports comments. -# (The GNU autoconf doc says that sed comments are not portable, but does -# not say which 'sed' versions are affected.) +# AIX 5.3 sed barfs over indented comments. if echo fo | sed -e 's/f/g/ # s/o/u/ + # indented comment s/o/e/' 2>/dev/null | grep ge > /dev/null; then sed_comments=true else @@ -127,6 +127,8 @@ func_usage () Usage: gnulib-tool --list gnulib-tool --find filename gnulib-tool --import [module1 ... moduleN] + gnulib-tool --add-import [module1 ... moduleN] + gnulib-tool --remove-import [module1 ... moduleN] gnulib-tool --update gnulib-tool --create-testdir --dir=directory [module1 ... moduleN] gnulib-tool --create-megatestdir --dir=directory [module1 ... moduleN] @@ -149,13 +151,18 @@ Usage: gnulib-tool --list gnulib-tool --copy-file file [destination] Operation modes: + --list print the available module names --find find the modules which contain the specified file - --import import the given modules into the current package; + --import import the given modules into the current package + --add-import augment the list of imports from gnulib into the + current package, by adding the given modules; if no modules are specified, update the current package from the current gnulib + --remove-import reduce the list of imports from gnulib into the + current package, by removing the given modules --update update the current package, restore files omitted - from CVS + from version control --create-testdir create a scratch package with the given modules --create-megatestdir create a mega scratch package with the given modules one by one and all together @@ -179,8 +186,11 @@ Operation modes: --extract-maintainer report the maintainer(s) inside gnulib --extract-tests-module report the unit test module, if it exists --copy-file copy a file that is not part of any module + --help Show this help text. + --version Show version and authorship information. General options: + --dir=DIRECTORY Specify the target directory. For --import, this specifies where your configure.ac can be found. Defaults to current @@ -192,21 +202,53 @@ General options: --verbose Increase verbosity. May be repeated. --quiet Decrease verbosity. May be repeated. -Options for --import, --update: +Options for --import, --add/remove-import, --update: + --dry-run Only print what would have been done. -Options for --import, --create-[mega]testdir, --[mega]test: +Options for --import, --add/remove-import: + --with-tests Include unit tests for the included modules. + +Options for --create-[mega]testdir, --[mega]test: + + --without-tests Don't include unit tests for the included modules. + +Options for --import, --add/remove-import, + --create-[mega]testdir, --[mega]test: + --with-obsolete Include obsolete modules when they occur among the dependencies. By default, dependencies to obsolete modules are ignored. + --with-c++-tests Include even unit tests for C++ interoperability. + --without-c++-tests Exclude unit tests for C++ interoperability. + --with-longrunning-tests + Include even unit tests that are long-runners. + --without-longrunning-tests + Exclude unit tests that are long-runners. + --with-privileged-tests + Include even unit tests that require root + privileges. + --without-privileged-tests + Exclude unit tests that require root privileges. + --with-unportable-tests + Include even unit tests that fail on some platforms. + --without-unportable-tests + Exclude unit tests that fail on some platforms. + --with-all-tests Include all kinds of problematic unit tests. --avoid=MODULE Avoid including the given MODULE. Useful if you have code that provides equivalent functionality. This option can be repeated. + --conditional-dependencies + Support conditional dependencies (may save configure + time and object code). + --no-conditional-dependencies + Don't use conditional dependencies. --libtool Use libtool rules. --no-libtool Don't use libtool rules. -Options for --import: +Options for --import, --add/remove-import: + --lib=LIBRARY Specify the library name. Defaults to 'libgnu'. --source-base=DIRECTORY Directory relative to --dir where source code is @@ -221,7 +263,7 @@ Options for --import: Directory relative to --dir where unit tests are placed (default \"tests\"). --aux-dir=DIRECTORY Directory relative to --dir where auxiliary build - tools are placed (default \"build-aux\"). + tools are placed (default comes from configure.ac). --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; @@ -233,26 +275,26 @@ Options for --import: '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. - --with-c++-tests Include even unit tests for C++ interoperability. - --with-longrunning-tests - Include even unit tests that are long-runners. - --with-privileged-tests - Include even unit tests that require root - privileges. - --with-unportable-tests - Include even unit tests that fail on some platforms. - --with-all-tests Include all kinds of problematic unit tests. + --witness-c-macro=NAME Specify the C macro that is defined when the + sources in this directory are compiled or used. --vc-files Update version control related files. --no-vc-files Don't update version control related files (.gitignore and/or .cvsignore). - --no-changelog Don't update or create ChangeLog files. -Options for --import, --update, --create-[mega]testdir, --[mega]test: +Options for --create-[mega]testdir, --[mega]test: + + --single-configure Generate a single configure file, not a separate + configure file for the tests directory. + +Options for --import, --add/remove-import, --update, + --create-[mega]testdir, --[mega]test: + -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. -Options for --import, --update: +Options for --import, --add/remove-import, --update: + -S, --more-symlinks Make symbolic links instead of copying files, and don't replace copyright notices. @@ -280,18 +322,8 @@ q date=`date -d "$date" -u +"%Y-%m-%d %H:%M:%S"` version=' '`cd "$gnulib_dir" && ./build-aux/git-version-gen /dev/null | sed -e 's/-dirty/-modified/'` else - if test -d "$gnulib_dir"/CVS \ - && (cvs --version) >/dev/null 2>/dev/null; then - # gnulib checked out from CVS. - sed_extract_first_date='/^date: /{ -s/^date: \([0-9][0-9][0-9][0-9]\).\([0-9][0-9]\).\([0-9][0-9]\) \([0-9][0-9]:[0-9][0-9]:[0-9][0-9]\).*/\1-\2-\3 \4/p -q -}' - date=`cd "$gnulib_dir" && cvs log -N ChangeLog 2>/dev/null | sed -n -e "$sed_extract_first_date"` - else - # gnulib copy without versioning information. - date=`sed -e 's/ .*//;q' "$gnulib_dir"/ChangeLog` - fi + # gnulib copy without versioning information. + date=`sed -e 's/ .*//;q' "$gnulib_dir"/ChangeLog` version= fi year=`"$gnulib_dir"/build-aux/mdate-sh "$self_abspathname" | sed -e 's,^.* ,,'` @@ -301,8 +333,8 @@ Copyright (C) $year Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. - -Written by" "Bruno Haible" "and" "Simon Josefsson" +" + printf "Written by %s, %s, and %s.\n" "Bruno Haible" "Paul Eggert" "Simon Josefsson" } # func_emit_copyright_notice @@ -314,10 +346,22 @@ func_emit_copyright_notice () q }' < "$self_abspathname" echo "#" - echo "# This file is free software, distributed under the terms of the GNU" - echo "# General Public License. As a special exception to the GNU General" - echo "# Public License, this file may be distributed as part of a program" - echo "# that contains a configuration script generated by Autoconf, under" + echo "# This file is free software; you can redistribute it and/or modify" + echo "# it under the terms of the GNU General Public License as published by" + echo "# the Free Software Foundation; either version 3 of the License, or" + echo "# (at your option) any later version." + echo "#" + echo "# This file is distributed in the hope that it will be useful," + echo "# but WITHOUT ANY WARRANTY; without even the implied warranty of" + echo "# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the" + echo "# GNU General Public License for more details." + echo "#" + echo "# You should have received a copy of the GNU General Public License" + echo "# along with this file. If not, see ." + echo "#" + echo "# As a special exception to the GNU General Public License," + echo "# this file may be distributed as part of a program that" + echo "# contains a configuration script generated by Autoconf, under" echo "# the same distribution terms as the rest of that program." echo "#" echo "# Generated by gnulib-tool." @@ -363,15 +407,14 @@ func_gnulib_dir () # 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" + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi if test "$PATH_SEPARATOR" = ";"; then # On Windows, programs are searched in "." before $PATH. @@ -540,7 +583,7 @@ func_warning () # func_readlink SYMLINK # outputs the target of the given symlink. -if (type -p readlink) > /dev/null 2>&1; then +if (type readlink) > /dev/null 2>&1; then func_readlink () { # Use the readlink program from GNU coreutils. @@ -810,20 +853,24 @@ fi # that the top-level statement containing the test starts after the 'alias' # command. if test -z "$have_echo"; then -bsd_echo () + bsd_echo () { cat </dev/null + if (alias echo=bsd_echo) 2>/dev/null; then + alias echo=bsd_echo 2>/dev/null + fi fi if test -z "$have_echo" \ && echo '\t' | grep t > /dev/null; then have_echo=yes fi if test -z "$have_echo"; then - unalias echo 2>/dev/null + if (alias echo=bsd_echo) 2>/dev/null; then + unalias echo 2>/dev/null + fi fi # For Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh. if test -z "$have_echo" \ @@ -851,9 +898,14 @@ if test "X$1" = "X--no-reexec"; then shift fi +# Unset CDPATH. Otherwise, output from 'cd dir' can surprise callers. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + # Command-line option processing. # Removes the OPTIONS from the arguments. Sets the variables: -# - mode list or import or create-testdir or create-megatestdir +# - mode one of: list, find, import, add-import, remove-import, +# update, create-testdir, create-megatestdir, test, megatest, +# copy-file # - destdir from --dir # - local_gnulib_dir from --local-dir # - modcache true or false, from --cache-modules/--no-cache-modules @@ -865,7 +917,8 @@ fi # - docbase from --doc-base # - testsbase from --tests-base # - auxdir from --aux-dir -# - inctests true if --with-tests was given, blank otherwise +# - inctests true if --with-tests was given, false if --without-tests +# was given, blank otherwise # - incobsolete true if --with-obsolete was given, blank otherwise # - inc_cxx_tests true if --with-c++-tests was given, blank otherwise # - inc_longrunning_tests true if --with-longrunning-tests was given, blank @@ -875,17 +928,27 @@ fi # - inc_unportable_tests true if --with-unportable-tests was given, blank # otherwise # - inc_all_tests true if --with-all-tests was given, blank otherwise +# - excl_cxx_tests true if --without-c++-tests was given, blank otherwise +# - excl_longrunning_tests true if --without-longrunning-tests was given, +# blank otherwise +# - excl_privileged_tests true if --without-privileged-tests was given, blank +# otherwise +# - excl_unportable_tests true if --without-unportable-tests was given, blank +# otherwise +# - single_configure true if --single-configure was given, false otherwise # - avoidlist list of modules to avoid, from --avoid +# - cond_dependencies true if --conditional-dependencies was given, false if +# --no-conditional-dependencies 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 +# - witness_c_macro from --witness-c-macro # - vc_files true if --vc-files was given, false if --no-vc-files was # given, blank otherwise # - 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 or --more-symlinks was given, blank # otherwise @@ -912,14 +975,20 @@ fi inc_privileged_tests= inc_unportable_tests= inc_all_tests= + excl_cxx_tests= + excl_longrunning_tests= + excl_privileged_tests= + excl_unportable_tests= + single_configure=false avoidlist= + cond_dependencies= lgpl= makefile_name= libtool= macro_prefix= po_domain= + witness_c_macro= vc_files= - do_changelog=: doit=: symbolic= lsymbolic= @@ -938,6 +1007,12 @@ fi --import | --impor | --impo | --imp | --im | --i ) mode=import shift ;; + --add-import | --add-impor | --add-impo | --add-imp | --add-im | --add-i | --add- | --add | --ad ) + mode=add-import + shift ;; + --remove-import | --remove-impor | --remove-impo | --remove-imp | --remove-im | --remove-i | --remove- | --remove | --remov | --remo | --rem | --re | --r ) + mode=remove-import + shift ;; --update | --updat | --upda | --upd | --up | --u ) mode=update shift ;; @@ -956,7 +1031,7 @@ fi --extract-* ) mode=`echo "X$1" | sed -e 's/^X--//'` shift ;; - --copy-file | --copy-fil | --copy-fi | --copy-f | --copy- | --copy | --cop | --co ) + --copy-file | --copy-fil | --copy-fi | --copy-f | --copy- | --copy | --cop ) mode=copy-file shift ;; --dir ) @@ -1084,6 +1159,24 @@ fi --with-all-tests | --with-all-test | --with-all-tes | --with-all-te | --with-all-t | --with-all- | --with-all | --with-al | --with-a) inc_all_tests=true shift ;; + --without-tests | --without-test | --without-tes | --without-te | --without-t) + inctests=false + shift ;; + --without-c++-tests | --without-c++-test | --without-c++-tes | --without-c++-te | --without-c++-t | --without-c++- | --without-c++ | --without-c+ | --without-c) + excl_cxx_tests=true + shift ;; + --without-longrunning-tests | --without-longrunning-test | --without-longrunning-tes | --without-longrunning-te | --without-longrunning-t | --without-longrunning- | --without-longrunning | --without-longrunnin | --without-longrunni | --without-longrunn | --without-longrun | --without-longru | --without-longr | --without-long | --without-lon | --without-lo | --without-l) + excl_longrunning_tests=true + shift ;; + --without-privileged-tests | --without-privileged-test | --without-privileged-tes | --without-privileged-te | --without-privileged-t | --without-privileged- | --without-privileged | --without-privilege | --without-privileg | --without-privile | --without-privil | --without-privi | --without-priv | --without-pri | --without-pr | --without-p) + excl_privileged_tests=true + shift ;; + --without-unportable-tests | --without-unportable-test | --without-unportable-tes | --without-unportable-te | --without-unportable-t | --without-unportable- | --without-unportable | --without-unportabl | --without-unportab | --without-unporta | --without-unport | --without-unpor | --without-unpo | --without-unp | --without-un | --without-u) + excl_unportable_tests=true + shift ;; + --single-configure | --single-configur | --single-configu | --single-config | --single-confi | --single-conf | --single-con | --single-con | --single-co | --single-c | --single- | --single | --singl | --sing | --sin | --si) + single_configure=true + shift ;; --avoid ) shift if test $# = 0; then @@ -1095,6 +1188,12 @@ fi arg=`echo "X$1" | sed -e 's/^X--avoid=//'` func_append avoidlist " $arg" shift ;; + --conditional-dependencies | --conditional-dependencie | --conditional-dependenci | --conditional-dependenc | --conditional-dependen | --conditional-depende | --conditional-depend | --conditional-depen | --conditional-depe | --conditional-dep | --conditional-de | --conditional-d | --conditional- | --conditional | --conditiona | --condition | --conditio | --conditi | --condit | --condi | --cond | --con) + cond_dependencies=true + shift ;; + --no-conditional-dependencies | --no-conditional-dependencie | --no-conditional-dependenci | --no-conditional-dependenc | --no-conditional-dependen | --no-conditional-depende | --no-conditional-depend | --no-conditional-depen | --no-conditional-depe | --no-conditional-dep | --no-conditional-de | --no-conditional-d | --no-conditional- | --no-conditional | --no-conditiona | --no-condition | --no-conditio | --no-conditi | --no-condit | --no-condi | --no-cond | --no-con | --no-co) + cond_dependencies=false + shift ;; --lgpl ) lgpl=yes shift ;; @@ -1142,6 +1241,16 @@ fi --po-domain=* ) po_domain=`echo "X$1" | sed -e 's/^X--po-domain=//'` shift ;; + --witness-c-macro ) + shift + if test $# = 0; then + func_fatal_error "missing argument for --witness-c-macro" + fi + witness_c_macro="$1" + shift ;; + --witness-c-macro=* ) + witness_c_macro=`echo "X$1" | sed -e 's/^X--witness-c-macro=//'` + shift ;; --vc-files ) vc_files=true shift ;; @@ -1149,7 +1258,7 @@ fi vc_files=false shift ;; --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch ) - do_changelog=false + # A no-op for backward compatibility. shift ;; --dry-run ) doit=false @@ -1183,6 +1292,15 @@ fi esac done + if case "$mode" in import | add-import | remove-import) true;; *) false;; esac; then + if test -n "$excl_cxx_tests" || test -n "$excl_longrunning_tests" \ + || test -n "$excl_privileged_tests" || test -n "$excl_unportable_tests" \ + || test "$single_configure" != false; then + echo "gnulib-tool: invalid options for '$mode' mode" 1>&2 + echo "Try 'gnulib-tool --help' for more information." 1>&2 + func_exit 1 + fi + fi if test "$mode" = update; then if test $# != 0; then echo "gnulib-tool: too many arguments in 'update' mode" 1>&2 @@ -1198,16 +1316,17 @@ fi || test -n "$inc_cxx_tests" || test -n "$inc_longrunning_tests" \ || test -n "$inc_privileged_tests" || test -n "$inc_unportable_tests" \ || test -n "$inc_all_tests" \ + || test -n "$excl_cxx_tests" || test -n "$excl_longrunning_tests" \ + || test -n "$excl_privileged_tests" || test -n "$excl_unportable_tests" \ || test -n "$avoidlist" || test -n "$lgpl" || test -n "$makefile_name" \ || test -n "$macro_prefix" || test -n "$po_domain" \ - || test -n "$vc_files"; then + || test -n "$witness_c_macro" || test -n "$vc_files"; 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 echo "you need to use 'gnulib --import' - at your own risk!" 1>&2 func_exit 1 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 @@ -1217,13 +1336,33 @@ fi if test -z "$pobase" && test -n "$po_domain"; then func_warning "--po-domain has no effect without a --po-base option" fi + # Canonicalize the inctests variable. + case "$mode" in + import | add-import | remove-import | update) + if test -z "$inctests"; then + inctests=false + fi + ;; + create-testdir | create-megatestdir | test | megatest) + if test -z "$inctests"; then + inctests=true + fi + ;; + esac + # Now the only possible values of "$inctests" are true and false + # (or blank but then it is irrelevant). + if test "$cond_dependencies" = true && test "$inctests" = true; then + echo "gnulib-tool: option --conditional-dependencies is not supported with --with-tests" 1>&2 + func_exit 1 + fi # Determine the minimum supported autoconf version from the project's # configure.ac. DEFAULT_AUTOCONF_MINVERSION="2.59" autoconf_minversion= configure_ac= - if { test "$mode" = import || test "$mode" = update; } && test -n "$destdir"; then + if case "$mode" in import | add-import | remove-import | update) true;; *) false;; esac \ + && test -n "$destdir"; then if test -f "$destdir"/configure.ac; then configure_ac="$destdir/configure.ac" else @@ -1242,7 +1381,7 @@ fi fi if test -n "$configure_ac"; then # Use sed, not autoconf --trace, to look for the AC_PREREQ invocation, - # because when some m4 files are omitted from a CVS repository, + # because when some m4 files are omitted from a version control repository, # "autoconf --trace=AC_PREREQ" fails with an error message like this: # m4: aclocal.m4:851: Cannot open m4/absolute-header.m4: No such file or directory # autom4te: m4 failed with exit status: 1 @@ -1309,6 +1448,15 @@ for signal in 1 2 3 13 15; do done signal=0 +# Note: The 'eval' silences stderr output in dash. +if (declare -A x && { x[f/2]='foo'; x[f/3]='bar'; eval test '${x[f/2]}' = foo; }) 2>/dev/null; then + # Zsh 4 and Bash 4 have associative arrays. + have_associative=true +else + # For other shells, use 'eval' with computed shell variable names. + have_associative=false +fi + # func_lookup_file file # looks up a file in $local_gnulib_dir or $gnulib_dir, or combines it through # 'patch'. @@ -1349,8 +1497,7 @@ func_lookup_file () # the resulting list to standard output, one per line. func_sanitize_modulelist () { - sed -e '/^CVS\//d' -e '/\/CVS\//d' \ - -e '/^ChangeLog$/d' -e '/\/ChangeLog$/d' \ + sed -e '/^ChangeLog$/d' -e '/\/ChangeLog$/d' \ -e '/^COPYING$/d' -e '/\/COPYING$/d' \ -e '/^README$/d' -e '/\/README$/d' \ -e '/^TEMPLATE$/d' \ @@ -1388,7 +1535,6 @@ func_exists_module () { test -f "$gnulib_dir/modules/$1" \ || { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \ && test -f "$local_gnulib_dir/modules/$1"; }; } \ - && test "CVS" != "$1" \ && test "ChangeLog" != "$1" \ && test "COPYING" != "$1" \ && test "README" != "$1" \ @@ -1492,15 +1638,6 @@ sed_extract_field_header=' if $modcache; then - # Note: The 'eval' silences stderr output in dash. - if declare -A x 2>/dev/null && { x[f/2]='foo'; x[f/3]='bar'; eval test '${x[f/2]}' = foo; }; then - # Zsh 4 and Bash 4 have associative arrays. - have_associative=true - else - # For other shells, use 'eval' with computed shell variable names. - have_associative=false - fi - if $have_associative; then # Declare the associative arrays. @@ -1523,11 +1660,11 @@ if $modcache; then # ${param//pattern/replacement} # as a shorthand for # `echo "$param" | sed -e "s/pattern/replacement/g"`. - # Note: The 'eval' above silences stderr output in dash. - func_cache_var () + # Note: The 'eval' is necessary for dash and NetBSD /bin/sh. + eval 'func_cache_var () { cachevar=c_${1//[!a-zA-Z0-9_]/_} - } + }' else func_cache_var () { @@ -1712,7 +1849,7 @@ if $modcache; then func_cache_lookup_module () { if $have_associative; then - cached=${modcache_cached[$1]} + eval 'cached=${modcache_cached[$1]}' else func_cache_var "$1" eval "cached=\"\$${cachevar}_cached\"" @@ -1721,7 +1858,7 @@ if $modcache; then # Not found in cache. Look it up on the file system. func_lookup_file "modules/$1" if $have_associative; then - modcache_cached[$1]=yes + eval 'modcache_cached[$1]=yes' else eval "${cachevar}_cached=\"\$1\"" fi @@ -1756,8 +1893,8 @@ func_get_description () func_cache_lookup_module "$1" # Output the field's value, including the final newline (if any). if $have_associative; then - if test -n "${modcache_description[$1]+set}"; then - echo "${modcache_description[$1]}" + if eval 'test -n "${modcache_description[$1]+set}"'; then + eval 'echo "${modcache_description[$1]}"' fi else eval "field_set=\"\$${cachevar}_description_set\"" @@ -1782,8 +1919,8 @@ func_get_comment () func_cache_lookup_module "$1" # Output the field's value, including the final newline (if any). if $have_associative; then - if test -n "${modcache_comment[$1]+set}"; then - echo "${modcache_comment[$1]}" + if eval 'test -n "${modcache_comment[$1]+set}"'; then + eval 'echo "${modcache_comment[$1]}"' fi else eval "field_set=\"\$${cachevar}_comment_set\"" @@ -1808,8 +1945,8 @@ func_get_status () func_cache_lookup_module "$1" # Output the field's value, including the final newline (if any). if $have_associative; then - if test -n "${modcache_status[$1]+set}"; then - echo "${modcache_status[$1]}" + if eval 'test -n "${modcache_status[$1]+set}"'; then + eval 'echo "${modcache_status[$1]}"' fi else eval "field_set=\"\$${cachevar}_status_set\"" @@ -1834,8 +1971,8 @@ func_get_notice () func_cache_lookup_module "$1" # Output the field's value, including the final newline (if any). if $have_associative; then - if test -n "${modcache_notice[$1]+set}"; then - echo "${modcache_notice[$1]}" + if eval 'test -n "${modcache_notice[$1]+set}"'; then + eval 'echo "${modcache_notice[$1]}"' fi else eval "field_set=\"\$${cachevar}_notice_set\"" @@ -1861,7 +1998,7 @@ func_get_applicability () func_cache_lookup_module "$1" # Get the field's value, without the final newline. if $have_associative; then - my_applicability="${modcache_applicability[$1]}" + eval 'my_applicability="${modcache_applicability[$1]}"' else eval "my_applicability=\"\$${cachevar}_applicability\"" fi @@ -1890,8 +2027,8 @@ func_get_filelist () func_cache_lookup_module "$1" # Output the field's value, including the final newline (if any). if $have_associative; then - if test -n "${modcache_files[$1]+set}"; then - echo "${modcache_files[$1]}" + if eval 'test -n "${modcache_files[$1]+set}"'; then + eval 'echo "${modcache_files[$1]}"' fi else eval "field_set=\"\$${cachevar}_files_set\"" @@ -1974,24 +2111,26 @@ func_get_dependencies () ;; esac # Then the explicit dependencies listed in the module description. - if ! $modcache; then - func_lookup_file "modules/$1" - sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file" - else - func_cache_lookup_module "$1" - # Output the field's value, including the final newline (if any). - if $have_associative; then - if test -n "${modcache_dependson[$1]+set}"; then - echo "${modcache_dependson[$1]}" - fi + { if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file" else - eval "field_set=\"\$${cachevar}_dependson_set\"" - if test -n "$field_set"; then - eval "field_value=\"\$${cachevar}_dependson\"" - echo "${field_value}" + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if eval 'test -n "${modcache_dependson[$1]+set}"'; then + eval 'echo "${modcache_dependson[$1]}"' + fi + else + eval "field_set=\"\$${cachevar}_dependson_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_dependson\"" + echo "${field_value}" + fi fi fi - fi + } \ + | sed -e '/^#/d' } # func_get_autoconf_early_snippet module @@ -2007,8 +2146,8 @@ func_get_autoconf_early_snippet () func_cache_lookup_module "$1" # Output the field's value, including the final newline (if any). if $have_associative; then - if test -n "${modcache_configureac_early[$1]+set}"; then - echo "${modcache_configureac_early[$1]}" + if eval 'test -n "${modcache_configureac_early[$1]+set}"'; then + eval 'echo "${modcache_configureac_early[$1]}"' fi else eval "field_set=\"\$${cachevar}_configureac_early_set\"" @@ -2033,8 +2172,8 @@ func_get_autoconf_snippet () func_cache_lookup_module "$1" # Output the field's value, including the final newline (if any). if $have_associative; then - if test -n "${modcache_configureac[$1]+set}"; then - echo "${modcache_configureac[$1]}" + if eval 'test -n "${modcache_configureac[$1]+set}"'; then + eval 'echo "${modcache_configureac[$1]}"' fi else eval "field_set=\"\$${cachevar}_configureac_set\"" @@ -2046,11 +2185,13 @@ func_get_autoconf_snippet () fi } -# func_get_automake_snippet module +# func_get_automake_snippet_conditional module +# returns the part of the Makefile.am snippet that can be put inside Automake +# conditionals. # Input: # - local_gnulib_dir from --local-dir # - modcache true or false, from --cache-modules/--no-cache-modules -func_get_automake_snippet () +func_get_automake_snippet_conditional () { if ! $modcache; then func_lookup_file "modules/$1" @@ -2059,8 +2200,8 @@ func_get_automake_snippet () func_cache_lookup_module "$1" # Output the field's value, including the final newline (if any). if $have_associative; then - if test -n "${modcache_makefile[$1]+set}"; then - echo "${modcache_makefile[$1]}" + if eval 'test -n "${modcache_makefile[$1]+set}"'; then + eval 'echo "${modcache_makefile[$1]}"' fi else eval "field_set=\"\$${cachevar}_makefile_set\"" @@ -2070,6 +2211,16 @@ func_get_automake_snippet () fi fi fi +} + +# func_get_automake_snippet_unconditional module +# returns the part of the Makefile.am snippet that must stay outside of +# Automake conditionals. +# Input: +# - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules +func_get_automake_snippet_unconditional () +{ case "$1" in *-tests) # *-tests module live in tests/, not lib/. @@ -2094,11 +2245,13 @@ func_get_automake_snippet () sed_extract_mentioned_files='s/^lib_SOURCES[ ]*+=[ ]*//p' already_mentioned_files=` \ { if ! $modcache; then + func_lookup_file "modules/$1" sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" else + func_cache_lookup_module "$1" if $have_associative; then - if test -n "${modcache_makefile[$1]+set}"; then - echo "${modcache_makefile[$1]}" + if eval 'test -n "${modcache_makefile[$1]+set}"'; then + eval 'echo "${modcache_makefile[$1]}"' fi else eval 'field_set="$'"${cachevar}"'_makefile_set"' @@ -2134,6 +2287,7 @@ func_get_automake_snippet () # automake will generate a useless dependency; this is harmless. case "$1" in relocatable-prog-wrapper) ;; + pt_chown) ;; *) func_filter_filelist extra_files "$nl" "$extra_files" '' '.c' '' '' if test -n "$extra_files"; then @@ -2160,6 +2314,16 @@ func_get_automake_snippet () esac } +# func_get_automake_snippet module +# Input: +# - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules +func_get_automake_snippet () +{ + func_get_automake_snippet_conditional "$1" + func_get_automake_snippet_unconditional "$1" +} + # func_get_include_directive module # Input: # - local_gnulib_dir from --local-dir @@ -2174,8 +2338,8 @@ func_get_include_directive () func_cache_lookup_module "$1" # Output the field's value, including the final newline (if any). if $have_associative; then - if test -n "${modcache_include[$1]+set}"; then - echo "${modcache_include[$1]}" + if eval 'test -n "${modcache_include[$1]+set}"'; then + eval 'echo "${modcache_include[$1]}"' fi else eval "field_set=\"\$${cachevar}_include_set\"" @@ -2201,8 +2365,8 @@ func_get_link_directive () func_cache_lookup_module "$1" # Output the field's value, including the final newline (if any). if $have_associative; then - if test -n "${modcache_link[$1]+set}"; then - echo "${modcache_link[$1]}" + if eval 'test -n "${modcache_link[$1]+set}"'; then + eval 'echo "${modcache_link[$1]}"' fi else eval "field_set=\"\$${cachevar}_link_set\"" @@ -2214,31 +2378,50 @@ func_get_link_directive () fi } -# func_get_license module +# func_get_license_raw module # Input: # - local_gnulib_dir from --local-dir # - modcache true or false, from --cache-modules/--no-cache-modules -func_get_license () +func_get_license_raw () { - { - if ! $modcache; then - func_lookup_file "modules/$1" - sed -n -e "/^License$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^License$sed_extract_prog" < "$lookedup_file" + else + func_cache_lookup_module "$1" + # Output the field's value, including the final newline (if any). + if $have_associative; then + if eval 'test -n "${modcache_license[$1]+set}"'; then + eval 'echo "${modcache_license[$1]}"' + fi else - func_cache_lookup_module "$1" - # Output the field's value, including the final newline (if any). - if $have_associative; then - if test -n "${modcache_license[$1]+set}"; then - echo "${modcache_license[$1]}" - fi - else - eval "field_set=\"\$${cachevar}_license_set\"" - if test -n "$field_set"; then - eval "field_value=\"\$${cachevar}_license\"" - echo "${field_value}" - fi + eval "field_set=\"\$${cachevar}_license_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_license\"" + echo "${field_value}" fi fi + fi +} + +# func_get_license module +# Input: +# - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules +func_get_license () +{ + # Warn if the License field is missing. + case "$1" in + *-tests ) ;; + * ) + license=`func_get_license_raw "$1"` + if test -z "$license"; then + func_warning "module $1 lacks a License" + fi + ;; + esac + { + func_get_license_raw "$1" # The default is GPL. echo "GPL" } | sed -e 's,^ *$,,' | sed -e 1q @@ -2257,8 +2440,8 @@ func_get_maintainer () func_cache_lookup_module "$1" # Output the field's value, including the final newline (if any). if $have_associative; then - if test -n "${modcache_maintainer[$1]+set}"; then - echo "${modcache_maintainer[$1]}" + if eval 'test -n "${modcache_maintainer[$1]+set}"'; then + eval 'echo "${modcache_maintainer[$1]}"' fi else eval "field_set=\"\$${cachevar}_maintainer_set\"" @@ -2286,16 +2469,6 @@ func_get_tests_module () # func_acceptable module # tests whether a module is acceptable. # Input: -# - inc_cxx_tests true if C++ interoperability tests should be included, -# blank otherwise -# - inc_longrunning_tests true if long-runnings tests should be included, -# blank otherwise -# - inc_privileged_tests true if tests that require root privileges should be -# included, blank otherwise -# - inc_unportable_tests true if tests that fail on some platforms should be -# included, blank otherwise -# - inc_all_tests true if all kinds of problematic unit tests should be -# included, blank otherwise # - avoidlist list of modules to avoid func_acceptable () { @@ -2304,47 +2477,152 @@ func_acceptable () return 1 fi done - case "$1" in - *-tests) - inc=true - for word in `func_get_status "$1"`; do - case "$word" in - c++-test) - test -n "$inc_all_tests" || test -n "$inc_cxx_tests" \ - || inc=false - ;; - longrunning-test) - test -n "$inc_all_tests" || test -n "$inc_longrunning_tests" \ - || inc=false - ;; - privileged-test) - test -n "$inc_all_tests" || test -n "$inc_privileged_tests" \ - || inc=false - ;; - unportable-test) - test -n "$inc_all_tests" || test -n "$inc_unportable_tests" \ - || inc=false - ;; - *-test) - test -n "$inc_all_tests" \ - || inc=false - ;; - esac - done - if ! $inc; then - return 1 - fi - ;; - esac return 0 } +# sed expression to keep the first 32 characters of each line. +sed_first_32_chars='s/^\(................................\).*/\1/' + +# func_module_shellfunc_name module +# computes the shell function name that will contain the m4 macros for the module. +# Input: +# - macro_prefix prefix to use +# Output: +# - shellfunc shell function name +func_module_shellfunc_name () +{ + case $1 in + *[!a-zA-Z0-9_]*) + shellfunc=func_${macro_prefix}_gnulib_m4code_`echo "$1" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` ;; + *) + shellfunc=func_${macro_prefix}_gnulib_m4code_$1 ;; + esac +} + +# func_module_shellvar_name module +# computes the shell variable name the will be set to true once the m4 macros +# for the module have been executed. +# Output: +# - shellvar shell variable name +func_module_shellvar_name () +{ + case $1 in + *[!a-zA-Z0-9_]*) + shellvar=${macro_prefix}_gnulib_enabled_`echo "$1" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` ;; + *) + shellvar=${macro_prefix}_gnulib_enabled_$1 ;; + esac +} + +# func_module_conditional_name module +# computes the automake conditional name for the module. +# Output: +# - conditional name of automake conditional +func_module_conditional_name () +{ + case $1 in + *[!a-zA-Z0-9_]*) + conditional=${macro_prefix}_GNULIB_ENABLED_`echo "$1" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` ;; + *) + conditional=${macro_prefix}_GNULIB_ENABLED_$1 ;; + esac +} + +# func_uncond_add_module B +# notes the presence of B as an unconditional module. +# +# func_conddep_add_module A B cond +# notes the presence of a conditional dependency from module A to module B, +# subject to the condition that A is enabled and cond is true. +# +# func_cond_module_p B +# tests whether module B is conditional. +# +# func_cond_module_condition A B +# returns the condition when B should be enabled as a dependency of A, once the +# m4 code for A has been executed. +# Output: - condition +# +if $have_associative; then + declare -A conddep_isuncond + declare -A conddep_dependers + declare -A conddep_condition + func_uncond_add_module () + { + eval 'conddep_isuncond[$1]=true' + eval 'unset conddep_dependers[$1]' + } + func_conddep_add_module () + { + eval 'isuncond="${conddep_isuncond[$2]}"' + if test -z "$isuncond"; then + # No unconditional dependency to B known at this point. + eval 'conddep_dependers[$2]="${conddep_dependers[$2]} $1"' + eval 'conddep_condition[$1---$2]="$3"' + fi + } + func_cond_module_p () + { + eval 'previous_dependers="${conddep_dependers[$1]}"' + test -n "$previous_dependers" + } + func_cond_module_condition () + { + eval 'condition="${conddep_condition[$1---$2]}"' + } +else + func_uncond_add_module () + { + case $1 in + *[!a-zA-Z0-9_]*) + suffix=`echo "$1" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` ;; + *) + suffix=$1 ;; + esac + eval 'conddep_isuncond_'"$suffix"'=true' + eval 'unset conddep_dependers_'"$suffix" + } + func_conddep_add_module () + { + case $2 in + *[!a-zA-Z0-9_]*) + suffix=`echo "$2" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` ;; + *) + suffix=$2 ;; + esac + eval 'isuncond="${conddep_isuncond_'"$suffix"'}"' + if test -z "$isuncond"; then + eval 'conddep_dependers_'"$suffix"'="${conddep_dependers_'"$suffix"'} $1"' + suffix=`echo "$1---$2" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` + eval 'conddep_condition_'"$suffix"'="$3"' + fi + } + func_cond_module_p () + { + case $1 in + *[!a-zA-Z0-9_]*) + suffix=`echo "$1" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` ;; + *) + suffix=$1 ;; + esac + eval 'previous_dependers="${conddep_dependers_'"$suffix"'}"' + test -n "$previous_dependers" + } + func_cond_module_condition () + { + suffix=`echo "$1---$2" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` + eval 'condition="${conddep_condition_'"$suffix"'}"' + } +fi + +sed_dependencies_without_conditions='s/ *\[.*//' + # func_modules_transitive_closure # Input: # - local_gnulib_dir from --local-dir # - modcache true or false, from --cache-modules/--no-cache-modules # - modules list of specified modules -# - inctests true if tests should be included, blank otherwise +# - inctests true if tests should be included, false otherwise # - incobsolete true if obsolete modules among dependencies should be # included, blank otherwise # - inc_cxx_tests true if C++ interoperability tests should be included, @@ -2355,14 +2633,31 @@ func_acceptable () # included, blank otherwise # - inc_unportable_tests true if tests that fail on some platforms should be # included, blank otherwise -# - inc_all_tests true if all kinds of problematic unit tests should be -# included, blank otherwise +# - inc_all_direct_tests true if all kinds of problematic unit tests among +# the unit tests of the specified modules should be +# included, blank otherwise +# - inc_all_indirect_tests true if all kinds of problematic unit tests among +# the unit tests of the dependencies should be +# included, blank otherwise +# - excl_cxx_tests true if C++ interoperability tests should be excluded, +# blank otherwise +# - excl_longrunning_tests true if long-runnings tests should be excluded, +# blank otherwise +# - excl_privileged_tests true if tests that require root privileges should be +# excluded, blank otherwise +# - excl_unportable_tests true if tests that fail on some platforms should be +# excluded, blank otherwise # - avoidlist list of modules to avoid +# - cond_dependencies true if conditional dependencies shall be supported, +# blank otherwise # - tmp pathname of a temporary directory # Output: # - modules list of modules, including dependencies +# - conddep_dependers, conddep_condition information about conditionally +# enabled modules func_modules_transitive_closure () { + sed_escape_dependency='s|\([/.]\)|\\\1|g' # In order to process every module only once (for speed), process an "input # list" of modules, producing an "output list" of modules. During each round, # more modules can be queued in the input list. Once a module on the input @@ -2371,6 +2666,17 @@ func_modules_transitive_closure () handledmodules= inmodules="$modules" outmodules= + fmtc_inc_all_tests="$inc_all_direct_tests" + if test "$cond_dependencies" = true; then + for module in $inmodules; do + func_verify_module + if test -n "$module"; then + if func_acceptable $module; then + func_uncond_add_module $module + fi + fi + done + fi while test -n "$inmodules"; do inmodules_this_round="$inmodules" inmodules= # Accumulator, queue for next round @@ -2379,33 +2685,99 @@ func_modules_transitive_closure () if test -n "$module"; then if func_acceptable $module; then func_append outmodules " $module" - deps=`func_get_dependencies $module` + if test "$cond_dependencies" = true; then + if func_get_automake_snippet_conditional $module | grep '^if ' > /dev/null; then + # A module whose Makefile.am snippet contains a reference to an + # automake conditional. If we were to use it conditionally, we + # would get an error + # configure: error: conditional "..." was never defined. + # because automake 1.11.1 does not handle nested conditionals + # correctly. As a workaround, make the module unconditional. + func_uncond_add_module $module + fi + if func_cond_module_p $module; then + conditional=true + else + conditional=false + fi + fi + deps=`func_get_dependencies $module | sed -e "$sed_dependencies_without_conditions"` # Duplicate dependencies are harmless, but Jim wants a warning. duplicated_deps=`echo "$deps" | LC_ALL=C sort | LC_ALL=C uniq -d` if test -n "$duplicated_deps"; then func_warning "module $module has duplicated dependencies: "`echo $duplicated_deps` fi - for dep in $deps; do - if test -n "$incobsolete" \ - || { inc=true - for word in `func_get_status $dep`; do - case "$word" in - obsolete) - inc=false - ;; - esac - done - $inc - }; then - func_append inmodules " $dep" - fi - done - if test -n "$inctests"; then + if $inctests; then testsmodule=`func_get_tests_module $module` if test -n "$testsmodule"; then - func_append inmodules " $testsmodule" + deps="$deps $testsmodule" fi fi + for dep in $deps; do + # Determine whether to include the dependency or tests module. + inc=true + for word in `func_get_status $dep`; do + case "$word" in + obsolete) + test -n "$incobsolete" \ + || inc=false + ;; + c++-test) + test -z "$excl_cxx_tests" \ + || inc=false + test -n "$fmtc_inc_all_tests" || test -n "$inc_cxx_tests" \ + || inc=false + ;; + longrunning-test) + test -z "$excl_longrunning_tests" \ + || inc=false + test -n "$fmtc_inc_all_tests" || test -n "$inc_longrunning_tests" \ + || inc=false + ;; + privileged-test) + test -z "$excl_privileged_tests" \ + || inc=false + test -n "$fmtc_inc_all_tests" || test -n "$inc_privileged_tests" \ + || inc=false + ;; + unportable-test) + test -z "$excl_unportable_tests" \ + || inc=false + test -n "$fmtc_inc_all_tests" || test -n "$inc_unportable_tests" \ + || inc=false + ;; + *-test) + test -n "$fmtc_inc_all_tests" \ + || inc=false + ;; + esac + done + if $inc && func_acceptable "$dep"; then + func_append inmodules " $dep" + if test "$cond_dependencies" = true; then + escaped_dep=`echo "$dep" | sed -e "$sed_escape_dependency"` + sed_extract_condition1='/^ *'"$escaped_dep"' *$/{ + s/^.*$/true/p + }' + sed_extract_condition2='/^ *'"$escaped_dep"' *\[.*\] *$/{ + s/^ *'"$escaped_dep"' *\[\(.*\)\] *$/\1/p + }' + condition=`func_get_dependencies $module | sed -n -e "$sed_extract_condition1" -e "$sed_extract_condition2"` + if test "$condition" = true; then + condition= + fi + if test -n "$condition"; then + func_conddep_add_module "$module" "$dep" "$condition" + else + if $conditional; then + func_conddep_add_module "$module" "$dep" true + else + func_uncond_add_module "$dep" + fi + fi + fi + fi + done fi fi done @@ -2413,14 +2785,143 @@ func_modules_transitive_closure () # Remove $handledmodules from $inmodules. for m in $inmodules; do echo $m; done | LC_ALL=C sort -u > "$tmp"/queued-modules inmodules=`echo "$handledmodules" | LC_ALL=C join -v 2 - "$tmp"/queued-modules` + fmtc_inc_all_tests="$inc_all_indirect_tests" done modules=`for m in $outmodules; do echo $m; done | LC_ALL=C sort -u` rm -f "$tmp"/queued-modules } -# func_modules_add_dummy +# func_show_module_list # Input: -# - local_gnulib_dir from --local-dir +# - specified_modules list of specified modules (one per line, sorted) +# - modules complete list of modules (one per line, sorted) +# - tmp pathname of a temporary directory +func_show_module_list () +{ + if case "$TERM" in + xterm*) test -t 1;; + *) false;; + esac; then + # Assume xterm compatible escape sequences. + bold_on=`printf '\x1b[1m'` + bold_off=`printf '\x1b[0m'` + else + bold_on= + bold_off= + fi + echo "Module list with included dependencies (indented):" + echo "$specified_modules" | sed -e '/^$/d' -e 's/$/| /' > "$tmp"/specified-modules + echo "$modules" | sed -e '/^$/d' \ + | LC_ALL=C join -t '|' -a2 "$tmp"/specified-modules - \ + | sed -e 's/^\(.*\)|.*/|\1/' -e 's/^/ /' -e 's/^ |\(.*\)$/ '"${bold_on}"'\1'"${bold_off}"'/' +} + +# func_modules_transitive_closure_separately +# 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 excluding +# modules of applicability 'all'. Its lib/* sources (brought in through +# dependencies of *-tests modules) go into $testsbase/. It may contain GPLed +# source, even if --lgpl is specified. +# Input: +# - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules +# - specified_modules list of specified modules +# - inctests true if tests should be included, false otherwise +# - incobsolete true if obsolete modules among dependencies should be +# included, blank otherwise +# - inc_cxx_tests true if C++ interoperability tests should be included, +# blank otherwise +# - inc_longrunning_tests true if long-runnings tests should be included, +# blank otherwise +# - inc_privileged_tests true if tests that require root privileges should be +# included, blank otherwise +# - inc_unportable_tests true if tests that fail on some platforms should be +# included, blank otherwise +# - inc_all_direct_tests true if all kinds of problematic unit tests among +# the unit tests of the specified modules should be +# included, blank otherwise +# - inc_all_indirect_tests true if all kinds of problematic unit tests among +# the unit tests of the dependencies should be +# included, blank otherwise +# - excl_cxx_tests true if C++ interoperability tests should be excluded, +# blank otherwise +# - excl_longrunning_tests true if long-runnings tests should be excluded, +# blank otherwise +# - excl_privileged_tests true if tests that require root privileges should be +# excluded, blank otherwise +# - excl_unportable_tests true if tests that fail on some platforms should be +# excluded, blank otherwise +# - avoidlist list of modules to avoid +# - cond_dependencies true if conditional dependencies shall be supported, +# blank otherwise +# - tmp pathname of a temporary directory +# Output: +# - main_modules list of modules, including dependencies +# - testsrelated_modules list of tests-related modules, including dependencies +# - conddep_dependers, conddep_condition information about conditionally +# enabled modules +func_modules_transitive_closure_separately () +{ + # Determine main module list. + saved_inctests="$inctests" + inctests=false + 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=`for module in $main_modules; do + if test \`func_get_applicability $module\` = main; then + echo $module + fi + done \ + | 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 +} + +# func_determine_use_libtests +# Determines whether a $testsbase/libtests.a is needed. +# Input: +# - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules +# - testsrelated_modules list of tests-related modules, including dependencies +# Output: +# - use_libtests true if a $testsbase/libtests.a is needed, false otherwise +func_determine_use_libtests () +{ + use_libtests=false + for module in $testsrelated_modules; do + func_verify_nontests_module + if test -n "$module"; then + all_files=`func_get_filelist $module` + # Test whether some file in $all_files lies in lib/. + for f in $all_files; do + case $f in + lib/*) + use_libtests=true + break 2 + ;; + esac + done + fi + done +} + +# func_modules_add_dummy +# Input: +# - local_gnulib_dir from --local-dir # - modcache true or false, from --cache-modules/--no-cache-modules # - modules list of modules, including dependencies # Output: @@ -2460,6 +2961,32 @@ ba fi } +# func_modules_add_dummy_separately +# Input: +# - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules +# - main_modules list of modules, including dependencies +# - testsrelated_modules list of tests-related modules, including dependencies +# - use_libtests true if a $testsbase/libtests.a is needed, false otherwise +# Output: +# - main_modules list of modules, including 'dummy' if needed +# - testsrelated_modules list of tests-related modules, including 'dummy' if +# needed +func_modules_add_dummy_separately () +{ + # Add the dummy module to the main module list if needed. + modules="$main_modules" + func_modules_add_dummy + main_modules="$modules" + + # 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 +} + # func_modules_notice # Input: # - local_gnulib_dir from --local-dir @@ -2502,6 +3029,55 @@ func_modules_to_filelist () files=`for f in $files; do echo $f; done | LC_ALL=C sort -u` } +# func_modules_to_filelist_separately +# 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. +# Input: +# - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules +# - main_modules list of modules, including dependencies +# - testsrelated_modules list of tests-related modules, including dependencies +func_modules_to_filelist_separately () +{ + # 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 + 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 +} + +# func_compute_include_guard_prefix +# Determine include_guard_prefix. +# Input: +# - macro_prefix prefix of gl_LIBOBJS macros to use +# Output: +# - include_guard_prefix replacement for ${gl_include_guard_prefix} +# - sed_replace_include_guard_prefix +# sed expression for resolving ${gl_include_guard_prefix} +func_compute_include_guard_prefix () +{ + if test "$macro_prefix" = gl; then + include_guard_prefix='GL' + else + include_guard_prefix='GL_'`echo "$macro_prefix" | LC_ALL=C tr '[a-z]' '[A-Z]'` + fi + sed_replace_include_guard_prefix='s/\${gl_include_guard_prefix}/'"${include_guard_prefix}"'/g' +} + # func_execute_command command [args...] # Executes a command. # Uses also the variables @@ -2572,7 +3148,7 @@ func_add_file () || { test -n "$lsymbolic" \ && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \ && test -z "$lookedup_tmp" \ - && cmp "$lookedup_file" "$tmpfile" > /dev/null; then + && cmp -s "$lookedup_file" "$tmpfile"; then func_ln_if_changed "$lookedup_file" "$destdir/$g" else mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" @@ -2601,7 +3177,7 @@ func_add_file () # - already_present nonempty if the file should already exist, empty otherwise func_update_file () { - if cmp "$destdir/$g" "$tmpfile" > /dev/null; then + if cmp -s "$destdir/$g" "$tmpfile"; then : # The file has not changed. else # Replace the file. @@ -2616,7 +3192,7 @@ func_update_file () || { test -n "$lsymbolic" \ && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \ && test -z "$lookedup_tmp" \ - && cmp "$lookedup_file" "$tmpfile" > /dev/null; then + && cmp -s "$lookedup_file" "$tmpfile"; then func_ln_if_changed "$lookedup_file" "$destdir/$g" else mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" @@ -2644,8 +3220,11 @@ func_update_file () # - 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) +# - witness_c_macro from --witness-c-macro # - actioncmd (optional) command that will reproduce this invocation # - for_test true if creating a package for testing, false otherwise +# - sed_replace_include_guard_prefix +# sed expression for resolving ${gl_include_guard_prefix} # - destfile filename relative to destdir of makefile being generated # Input/Output: # - makefile_am_edits and makefile_am_edit${edit}_{dir,var,val} @@ -2699,7 +3278,7 @@ func_emit_lib_Makefile_am () func_verify_nontests_module if test -n "$module"; then { - func_get_automake_snippet "$module" | + func_get_automake_snippet_conditional "$module" | LC_ALL=C \ sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \ -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \ @@ -2707,21 +3286,38 @@ func_emit_lib_Makefile_am () -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \ -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \ - -e "$sed_transform_check_PROGRAMS" + -e "$sed_transform_check_PROGRAMS" \ + -e "$sed_replace_include_guard_prefix" if test "$module" = 'alloca'; then echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@" echo "${libname}_${libext}_DEPENDENCIES += @${perhapsLT}ALLOCA@" fi - } > "$tmp"/amsnippet + } > "$tmp"/amsnippet1 + { + func_get_automake_snippet_unconditional "$module" | + LC_ALL=C sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' + } > "$tmp"/amsnippet2 # Skip the contents if it's entirely empty. - if grep '[^ ]' "$tmp"/amsnippet > /dev/null ; then + if grep '[^ ]' "$tmp"/amsnippet1 "$tmp"/amsnippet2 > /dev/null ; then echo "## begin gnulib module $module" echo - cat "$tmp"/amsnippet + if test "$cond_dependencies" = true; then + if func_cond_module_p "$module"; then + func_module_conditional_name "$module" + echo "if $conditional" + fi + fi + cat "$tmp"/amsnippet1 + if test "$cond_dependencies" = true; then + if func_cond_module_p "$module"; then + echo "endif" + fi + fi + cat "$tmp"/amsnippet2 echo "## end gnulib module $module" echo fi - rm -f "$tmp"/amsnippet + rm -f "$tmp"/amsnippet1 "$tmp"/amsnippet2 # Test whether there are some source files in subdirectories. for f in `func_get_filelist "$module"`; do case $f in @@ -2741,7 +3337,7 @@ func_emit_lib_Makefile_am () if test -n "$uses_subdirs"; then subdir_options=' subdir-objects' fi - echo "AUTOMAKE_OPTIONS = 1.5 gnits${subdir_options}" + echo "AUTOMAKE_OPTIONS = 1.9.6 gnits${subdir_options}" fi echo if test -z "$makefile_name"; then @@ -2749,8 +3345,12 @@ func_emit_lib_Makefile_am () echo "noinst_HEADERS =" echo "noinst_LIBRARIES =" echo "noinst_LTLIBRARIES =" - # Automake versions < 1.9b create an empty pkgdatadir at installation time - # if you specify pkgdata_DATA to empty. This is a workaround. + # Automake versions < 1.11.4 create an empty pkgdatadir at + # installation time if you specify pkgdata_DATA to empty. + # See automake bugs #10997 and #11030: + # * http://debbugs.gnu.org/10997 + # * http://debbugs.gnu.org/11030 + # So we need this workaround. if grep '^pkgdata_DATA *+=' "$tmp"/allsnippets > /dev/null; then echo "pkgdata_DATA =" fi @@ -2779,10 +3379,25 @@ func_emit_lib_Makefile_am () fi fi done + if test -n "$witness_c_macro"; then + cppflags_part1=" -D$witness_c_macro=1" + else + cppflags_part1= + fi + if $for_test; then + cppflags_part2=" -DGNULIB_STRICT_CHECKING=1" + else + cppflags_part2= + fi if test -z "$makefile_name"; then echo - echo "AM_CPPFLAGS =" + echo "AM_CPPFLAGS =$cppflags_part1$cppflags_part2" echo "AM_CFLAGS =" + else + if test -n "$cppflags_part1$cppflags_part2"; then + echo + echo "AM_CPPFLAGS +=$cppflags_part1$cppflags_part2" + fi fi echo if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$tmp"/allsnippets > /dev/null \ @@ -2807,6 +3422,18 @@ func_emit_lib_Makefile_am () echo "EXTRA_${libname}_${libext}_SOURCES =" if test "$libtool" = true; then echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)" + echo "${libname}_${libext}_LDFLAGS += -no-undefined" + # Synthesize an ${libname}_${libext}_LDFLAGS augmentation by combining + # the link dependencies of all modules. + for module in $modules; do + func_verify_nontests_module + if test -n "$module"; then + func_get_link_directive "$module" + fi + done \ + | LC_ALL=C sed -e '/^$/d' -e 's/ when linking with libtool.*//' \ + | LC_ALL=C sort -u \ + | LC_ALL=C sed -e 's/^/'"${libname}_${libext}"'_LDFLAGS += /' fi echo if test -n "$pobase"; then @@ -2918,8 +3545,13 @@ func_emit_po_POTFILES_in () # - m4base relative directory containing autoconf macros # - testsbase relative directory containing unit test code # - macro_prefix prefix of gl_LIBOBJS macros to use +# - witness_c_macro from --witness-c-macro # - for_test true if creating a package for testing, false otherwise +# - single_configure true if a single configure file should be generated, +# false for a separate configure file for the tests # - use_libtests true if a libtests.a should be built, false otherwise +# - sed_replace_include_guard_prefix +# sed expression for resolving ${gl_include_guard_prefix} # - destfile filename relative to destdir of makefile being generated # Input/Output: # - makefile_am_edits and makefile_am_edit${edit}_{dir,var,val} @@ -2931,9 +3563,11 @@ func_emit_tests_Makefile_am () witness_macro="$1" if test "$libtool" = true; then libext=la + perhapsLT=LT sed_eliminate_LDFLAGS="$sed_noop" else libext=a + perhapsLT= sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' fi if $for_test; then @@ -2953,7 +3587,7 @@ func_emit_tests_Makefile_am () uses_subdirs= { for module in $modules; do - if $for_test; then + if $for_test && ! $single_configure; then func_verify_tests_module else func_verify_module @@ -2968,7 +3602,8 @@ func_emit_tests_Makefile_am () -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" + -e "$sed_transform_check_PROGRAMS" \ + -e "$sed_replace_include_guard_prefix" if $use_libtests && test "$module" = 'alloca'; then echo "libtests_a_LIBADD += @${perhapsLT}ALLOCA@" echo "libtests_a_DEPENDENCIES += @${perhapsLT}ALLOCA@" @@ -2976,11 +3611,20 @@ func_emit_tests_Makefile_am () } > "$tmp"/amsnippet # Skip the contents if it's entirely empty. if grep '[^ ]' "$tmp"/amsnippet > /dev/null ; then - echo "## begin gnulib module $module" - echo - cat "$tmp"/amsnippet - echo "## end gnulib module $module" - echo + # Mention long-running tests at the end. + ofd=3 + for word in `func_get_status "$module"`; do + if test "$word" = 'longrunning-test'; then + ofd=4 + break + fi + done + { echo "## begin gnulib module $module" + echo + cat "$tmp"/amsnippet + echo "## end gnulib module $module" + echo + } >&$ofd fi rm -f "$tmp"/amsnippet # Test whether there are some source files in subdirectories. @@ -2994,7 +3638,7 @@ func_emit_tests_Makefile_am () done fi done - } > "$tmp"/allsnippets + } 3> "$tmp"/main_snippets 4> "$tmp"/longrunning_snippets # 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). @@ -3002,16 +3646,16 @@ func_emit_tests_Makefile_am () if test -n "$uses_subdirs"; then subdir_options=' subdir-objects' fi - echo "AUTOMAKE_OPTIONS = 1.5 foreign${subdir_options}" + echo "AUTOMAKE_OPTIONS = 1.9.6 foreign${subdir_options}" echo - if $for_test; then + if $for_test && ! $single_configure; 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" - echo "SUBDIRS =" + echo "SUBDIRS = ." echo "TESTS =" echo "XFAIL_TESTS =" echo "TESTS_ENVIRONMENT =" @@ -3028,9 +3672,13 @@ func_emit_tests_Makefile_am () 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 *+=' "$tmp"/allsnippets > /dev/null; then + # Automake versions < 1.11.4 create an empty pkgdatadir at + # installation time if you specify pkgdata_DATA to empty. + # See automake bugs #10997 and #11030: + # * http://debbugs.gnu.org/10997 + # * http://debbugs.gnu.org/11030 + # So we need this workaround. + if grep '^pkgdata_DATA *+=' "$tmp"/main_snippets "$tmp"/longrunning_snippets > /dev/null; then echo "pkgdata_DATA =" fi echo "EXTRA_DIST =" @@ -3057,6 +3705,12 @@ func_emit_tests_Makefile_am () done echo echo "AM_CPPFLAGS = \\" + if $for_test; then + echo " -DGNULIB_STRICT_CHECKING=1 \\" + fi + if test -n "$witness_c_macro"; then + echo " -D$witness_c_macro=1 \\" + fi if test -n "${witness_macro}"; then echo " -D@${witness_macro}@=1 \\" fi @@ -3096,7 +3750,7 @@ func_emit_tests_Makefile_am () # srcdir is defined by autoconf and automake. echo "TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='\$(srcdir)'" echo - cat "$tmp"/allsnippets \ + cat "$tmp"/main_snippets "$tmp"/longrunning_snippets \ | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' echo "# Clean up after Solaris cc." echo "clean-local:" @@ -3109,7 +3763,7 @@ func_emit_tests_Makefile_am () echo " fi; \\" echo " done; \\" echo " :" - rm -f "$tmp"/allsnippets + rm -f "$tmp"/main_snippets "$tmp"/longrunning_snippets } # func_emit_initmacro_start macro_prefix @@ -3224,20 +3878,219 @@ func_emit_initmacro_done () echo "])" } +# func_emit_autoconf_snippet indentation +# emits the autoconf snippet of a module. +# Input: +# - indentation spaces to prepend on each line +# - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules +# - sed_replace_build_aux sed expression that replaces reference to build-aux +# - sed_replace_include_guard_prefix +# sed expression for resolving ${gl_include_guard_prefix} +# - module the module name +# - toplevel true or false. 'false' means a subordinate use of +# gnulib-tool. +# - disable_libtool true or false. It tells whether to disable libtool +# handling even if it has been specified through the +# command line options. +# - disable_gettext true or false. It tells whether to disable AM_GNU_GETTEXT +# invocations. +func_emit_autoconf_snippet () +{ + indentation="$1" + if { case $module in + gnumakefile | maintainer-makefile) + # These modules are meant to be used only in the top-level directory. + $toplevel ;; + *) + true ;; + esac + }; then + func_get_autoconf_snippet "$module" \ + | sed -e '/^$/d;' -e "s/^/$indentation/" \ + -e "$sed_replace_build_aux" \ + -e "$sed_replace_include_guard_prefix" \ + | { if $disable_libtool; then + sed -e 's/\$gl_cond_libtool/false/g' \ + -e 's/gl_libdeps/gltests_libdeps/g' \ + -e 's/gl_ltlibdeps/gltests_ltlibdeps/g' + else + cat + fi + } \ + | { if $disable_gettext; then + sed -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./' + else + # Don't indent AM_GNU_GETTEXT_VERSION line, as that confuses + # autopoint through at least GNU gettext version 0.18.2. + sed -e 's/^ *AM_GNU_GETTEXT_VERSION/AM_GNU_GETTEXT_VERSION/' + fi + } + if test "$module" = 'alloca' && test "$libtool" = true && ! $disable_libtool; then + echo 'changequote(,)dnl' + echo 'LTALLOCA=`echo "$ALLOCA" | sed -e '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' + echo 'changequote([, ])dnl' + echo 'AC_SUBST([LTALLOCA])' + fi + fi +} + +# func_emit_autoconf_snippets modules verifier toplevel disable_libtool disable_gettext +# collects and emit the autoconf snippets of a set of modules. +# Input: +# - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules +# - sed_replace_build_aux sed expression that replaces reference to build-aux +# - sed_replace_include_guard_prefix +# sed expression for resolving ${gl_include_guard_prefix} +# - modules the list of modules. +# - verifier one of func_verify_module, func_verify_nontests_module, +# func_verify_tests_module. It selects the subset of +# $modules to consider. +# - toplevel true or false. 'false' means a subordinate use of +# gnulib-tool. +# - disable_libtool true or false. It tells whether to disable libtool +# handling even if it has been specified through the +# command line options. +# - disable_gettext true or false. It tells whether to disable AM_GNU_GETTEXT +# invocations. +func_emit_autoconf_snippets () +{ + verifier="$2" + toplevel="$3" + disable_libtool="$4" + disable_gettext="$5" + if test "$cond_dependencies" = true; then + for m in $modules; do echo $m; done | LC_ALL=C sort -u > "$tmp"/modules + # Emit the autoconf code for the unconditional modules. + for module in $1; do + eval $verifier + if test -n "$module"; then + if func_cond_module_p "$module"; then + : + else + func_emit_autoconf_snippet " " + fi + fi + done + # Initialize the shell variables indicating that the modules are enabled. + for module in $1; do + eval $verifier + if test -n "$module"; then + if func_cond_module_p "$module"; then + func_module_shellvar_name "$module" + echo " $shellvar=false" + fi + fi + done + # Emit the autoconf code for the conditional modules, each in a separate + # function. This makes it possible to support cycles among conditional + # modules. + for module in $1; do + eval $verifier + if test -n "$module"; then + if func_cond_module_p "$module"; then + func_module_shellfunc_name "$module" + func_module_shellvar_name "$module" + echo " $shellfunc ()" + echo ' {' + echo " if ! \$$shellvar; then" + func_emit_autoconf_snippet " " + echo " $shellvar=true" + deps=`func_get_dependencies $module | sed -e "$sed_dependencies_without_conditions"` + # Intersect $deps with the modules list $1. + deps=`for m in $deps; do echo $m; done | LC_ALL=C sort -u | LC_ALL=C join - "$tmp"/modules` + for dep in $deps; do + if func_cond_module_p "$dep"; then + func_module_shellfunc_name "$dep" + func_cond_module_condition "$module" "$dep" + if test "$condition" != true; then + echo " if $condition; then" + echo " $shellfunc" + echo ' fi' + else + echo " $shellfunc" + fi + else + # The autoconf code for $dep has already been emitted above and + # therefore is already executed when this function is run. + : + fi + done + echo ' fi' + echo ' }' + fi + fi + done + # Emit the dependencies from the unconditional to the conditional modules. + for module in $1; do + eval $verifier + if test -n "$module"; then + if func_cond_module_p "$module"; then + : + else + deps=`func_get_dependencies $module | sed -e "$sed_dependencies_without_conditions"` + # Intersect $deps with the modules list $1. + deps=`for m in $deps; do echo $m; done | LC_ALL=C sort -u | LC_ALL=C join - "$tmp"/modules` + for dep in $deps; do + if func_cond_module_p "$dep"; then + func_module_shellfunc_name "$dep" + func_cond_module_condition "$module" "$dep" + if test "$condition" != true; then + echo " if $condition; then" + echo " $shellfunc" + echo ' fi' + else + echo " $shellfunc" + fi + else + # The autoconf code for $dep has already been emitted above and + # therefore is already executed when this code is run. + : + fi + done + fi + fi + done + # Define the Automake conditionals. + echo " m4_pattern_allow([^${macro_prefix}_GNULIB_ENABLED_])" + for module in $1; do + eval $verifier + if test -n "$module"; then + if func_cond_module_p "$module"; then + func_module_conditional_name "$module" + func_module_shellvar_name "$module" + echo " AM_CONDITIONAL([$conditional], [\$$shellvar])" + fi + fi + done + else + # Ignore the conditions, and enable all modules unconditionally. + for module in $1; do + eval $verifier + if test -n "$module"; then + func_emit_autoconf_snippet " " + fi + done + fi +} + # func_import modules # Uses also the variables +# - mode import or add-import or remove-import or update # - destdir target directory # - local_gnulib_dir from --local-dir # - modcache true or false, from --cache-modules/--no-cache-modules # - verbose integer, default 0, inc/decremented by --verbose/--quiet # - libname library name +# - supplied_libname true if --lib was given, blank otherwise # - 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 +# - inctests true if --with-tests was given, false otherwise # - incobsolete true if --with-obsolete was given, blank otherwise # - inc_cxx_tests true if --with-c++-tests was given, blank otherwise # - inc_longrunning_tests true if --with-longrunning-tests was given, blank @@ -3248,6 +4101,8 @@ func_emit_initmacro_done () # otherwise # - inc_all_tests true if --with-all-tests was given, blank otherwise # - avoidlist list of modules to avoid, from --avoid +# - cond_dependencies true if --conditional-dependencies was given, false if +# --no-conditional-dependencies was given, blank otherwise # - lgpl yes or a number if library's license shall be LGPL, # blank otherwise # - makefile_name from --makefile-name @@ -3256,6 +4111,7 @@ func_emit_initmacro_done () # - 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) +# - witness_c_macro from --witness-c-macro # - vc_files true if --vc-files was given, false if --no-vc-files was # given, blank otherwise # - autoconf_minversion minimum supported autoconf version @@ -3268,6 +4124,8 @@ func_emit_initmacro_done () func_import () { # Get the cached settings. + # In 'import' mode, we read them only for the purpose of knowing the old + # installed file list, and don't use them as defaults. cached_local_gnulib_dir= cached_specified_modules= cached_incobsolete= @@ -3286,9 +4144,11 @@ func_import () cached_libname= cached_lgpl= cached_makefile_name= + cached_cond_dependencies= cached_libtool= cached_macro_prefix= cached_po_domain= + cached_witness_c_macro= cached_vc_files= cached_files= if test -f "$destdir"/$m4base/gnulib-cache.m4; then @@ -3361,6 +4221,9 @@ func_import () /gl_MAKEFILE_NAME(/ { s,^.*gl_MAKEFILE_NAME([[ ]*\([^]"$`\\)]*\).*$,cached_makefile_name="\1",p } + /gl_CONDITIONAL_DEPENDENCIES/ { + s,^.*$,cached_cond_dependencies=true,p + } /gl_LIBTOOL/ { s,^.*$,cached_libtool=true,p } @@ -3370,6 +4233,9 @@ func_import () /gl_PO_DOMAIN(/ { s,^.*gl_PO_DOMAIN([[ ]*\([^]"$`\\)]*\).*$,cached_po_domain="\1",p } + /gl_WITNESS_C_MACRO(/ { + s,^.*gl_WITNESS_C_MACRO([[ ]*\([^]"$`\\)]*\).*$,cached_witness_c_macro="\1",p + } /gl_VC_FILES(/ { s,^.*gl_VC_FILES([[ ]*\([^]"$`\\)]*\).*$,cached_vc_files="\1",p }' @@ -3397,200 +4263,215 @@ func_import () fi fi - # Merge the cached settings with the specified ones. - # The m4base must be the same as expected from the pathname. - if test -n "$cached_m4base" && test "$cached_m4base" != "$m4base"; then - func_fatal_error "$m4base/gnulib-cache.m4 is expected to contain gl_M4_BASE([$m4base])" - fi - # The local_gnulib_dir defaults to the cached one. Recall that the cached one - # is relative to $destdir, whereas the one we use is relative to . or absolute. - if test -z "$local_gnulib_dir"; then - if test -n "$cached_local_gnulib_dir"; then - case "$destdir" in - /*) - local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;; - *) - case "$cached_local_gnulib_dir" in - /*) - local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;; - *) - func_relconcat "$destdir" "$cached_local_gnulib_dir" - local_gnulib_dir="$relconcat" ;; - esac ;; - esac + if test "$mode" = import; then + # In 'import' mode, the new set of specified modules overrides the cached + # set of modules. Ignore the cached settings. + specified_modules="$1" + else + # Merge the cached settings with the specified ones. + # The m4base must be the same as expected from the pathname. + if test -n "$cached_m4base" && test "$cached_m4base" != "$m4base"; then + func_fatal_error "$m4base/gnulib-cache.m4 is expected to contain gl_M4_BASE([$m4base])" fi - fi - # Append the cached and the specified module names. So that - # "gnulib-tool --import foo" means to add the module foo. - specified_modules="$cached_specified_modules $1" - # Included obsolete modules among the dependencies if specified either way. - if test -z "$incobsolete"; then - incobsolete="$cached_incobsolete" - fi - # Included special kinds of tests modules among the dependencies if specified - # either way. - if test -z "$inc_cxx_tests"; then - inc_cxx_tests="$cached_inc_cxx_tests" - fi - if test -z "$inc_longrunning_tests"; then - inc_longrunning_tests="$cached_inc_longrunning_tests" - fi - if test -z "$inc_privileged_tests"; then - inc_privileged_tests="$cached_inc_privileged_tests" - fi - if test -z "$inc_unportable_tests"; then - inc_unportable_tests="$cached_inc_unportable_tests" - fi - if test -z "$inc_all_tests"; then - inc_all_tests="$cached_inc_all_tests" - fi - # Append the cached and the specified avoidlist. This is probably better - # than dropping the cached one when --avoid is specified at least once. - avoidlist=`for m in $cached_avoidlist $avoidlist; do echo $m; done | LC_ALL=C sort -u` - avoidlist=`echo $avoidlist` + # The local_gnulib_dir defaults to the cached one. Recall that the cached one + # is relative to $destdir, whereas the one we use is relative to . or absolute. + if test -z "$local_gnulib_dir"; then + if test -n "$cached_local_gnulib_dir"; then + case "$destdir" in + /*) + local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;; + *) + case "$cached_local_gnulib_dir" in + /*) + local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;; + *) + func_relconcat "$destdir" "$cached_local_gnulib_dir" + local_gnulib_dir="$relconcat" ;; + esac ;; + esac + fi + fi + case $mode in + add-import) + # Append the cached and the specified module names. So that + # "gnulib-tool --add-import foo" means to add the module foo. + specified_modules="$cached_specified_modules $1" + ;; + remove-import) + # Take the cached module names, minus the specified module names. + specified_modules= + if $have_associative; then + # Use an associative array, for O(N) worst-case run time. + declare -A to_remove + for m in $1; do + eval 'to_remove[$m]=yes' + done + for module in $cached_specified_modules; do + if eval 'test -z "${to_remove[$module]}"'; then + func_append specified_modules "$module " + fi + done + else + # This loop has O(N²) worst-case run time. + for module in $cached_specified_modules; do + to_remove= + for m in $1; do + if test "$m" = "$module"; then + to_remove=yes + break + fi + done + if test -z "$to_remove"; then + func_append specified_modules "$module " + fi + done + fi + ;; + update) + # Take the cached module names. There are no specified module names. + specified_modules="$cached_specified_modules" + ;; + esac + # Included obsolete modules among the dependencies if specified either way. + if test -z "$incobsolete"; then + incobsolete="$cached_incobsolete" + fi + # Included special kinds of tests modules among the dependencies if specified + # either way. + if test -z "$inc_cxx_tests"; then + inc_cxx_tests="$cached_inc_cxx_tests" + fi + if test -z "$inc_longrunning_tests"; then + inc_longrunning_tests="$cached_inc_longrunning_tests" + fi + if test -z "$inc_privileged_tests"; then + inc_privileged_tests="$cached_inc_privileged_tests" + fi + if test -z "$inc_unportable_tests"; then + inc_unportable_tests="$cached_inc_unportable_tests" + fi + if test -z "$inc_all_tests"; then + inc_all_tests="$cached_inc_all_tests" + fi + # Append the cached and the specified avoidlist. This is probably better + # than dropping the cached one when --avoid is specified at least once. + 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" + # The sourcebase defaults to the cached one. if test -z "$sourcebase"; then - func_fatal_error "missing --source-base option" + sourcebase="$cached_sourcebase" + if test -z "$sourcebase"; then + func_fatal_error "missing --source-base option" + fi 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" + # 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 - func_fatal_error "missing --doc-base option. --doc-base has been introduced on 2006-07-11; if your last invocation of 'gnulib-tool --import' is before that date, you need to run 'gnulib-tool --import' once, with a --doc-base option." + docbase="$cached_docbase" + if test -z "$docbase"; then + func_fatal_error "missing --doc-base option. --doc-base has been introduced on 2006-07-11; if your last invocation of 'gnulib-tool --import' is before that date, you need to run 'gnulib-tool --import' once, with a --doc-base option." + fi fi - fi - # The testsbase defaults to the cached one. - if test -z "$testsbase"; then - testsbase="$cached_testsbase" + # The testsbase defaults to the cached one. if test -z "$testsbase"; then - func_fatal_error "missing --tests-base option" + testsbase="$cached_testsbase" + if test -z "$testsbase"; then + func_fatal_error "missing --tests-base option" + fi fi - fi - # Require the tests if specified either way. - if test -z "$inctests"; then - inctests="$cached_inctests" - fi - # The libname defaults to the cached one. - if test -z "$supplied_libname"; then - libname="$cached_libname" - if test -z "$libname"; then - func_fatal_error "missing --lib option" + # Require the tests if specified either way. + if ! $inctests; then + inctests="$cached_inctests" + if test -z "$inctests"; then + inctests=false + fi fi - fi - # Require LGPL if specified either way. - if test -z "$lgpl"; then - lgpl="$cached_lgpl" - fi - # The makefile_name defaults to the cached one. - if test -z "$makefile_name"; then - makefile_name="$cached_makefile_name" - fi - # Use libtool if specified either way, or if guessed. - if test -z "$libtool"; then - if test -n "$cached_m4base"; then - libtool="$cached_libtool" - else - libtool="$guessed_libtool" + # The libname defaults to the cached one. + if test -z "$supplied_libname"; then + libname="$cached_libname" + if test -z "$libname"; then + func_fatal_error "missing --lib option" + fi fi - fi - # The macro_prefix defaults to the cached one. - if test -z "$macro_prefix"; then - macro_prefix="$cached_macro_prefix" + # Require LGPL if specified either way. + if test -z "$lgpl"; then + lgpl="$cached_lgpl" + fi + # The makefile_name defaults to the cached one. + if test -z "$makefile_name"; then + makefile_name="$cached_makefile_name" + fi + # Use conditional dependencies if specified either way. + if test -z "$cond_dependencies"; then + cond_dependencies="$cached_cond_dependencies" + fi + # Use libtool if specified either way, or if guessed. + if test -z "$libtool"; then + if test -n "$cached_m4base"; then + libtool="$cached_libtool" + else + libtool="$guessed_libtool" + fi + fi + # The macro_prefix defaults to the cached one. if test -z "$macro_prefix"; then - func_fatal_error "missing --macro-prefix option" + macro_prefix="$cached_macro_prefix" + if test -z "$macro_prefix"; then + 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 + # The witness_c_macro defaults to the cached one. + if test -z "$witness_c_macro"; then + witness_c_macro="$cached_witness_c_macro" + fi + # The vc_files defaults to the cached one. + if test -z "$vc_files"; then + vc_files="$cached_vc_files" + fi + # Ensure constraints. + if test "$cond_dependencies" = true && $inctests; then + echo "gnulib-tool: option --conditional-dependencies is not supported with --with-tests" 1>&2 + func_exit 1 fi fi - # The po_domain defaults to the cached one. - if test -z "$po_domain"; then - po_domain="$cached_po_domain" - fi - # The vc_files defaults to the cached one. - if test -z "$vc_files"; then - vc_files="$cached_vc_files" - fi + # --without-*-tests options are not supported here. + excl_cxx_tests= + excl_longrunning_tests= + excl_privileged_tests= + excl_unportable_tests= # Canonicalize the list of specified modules. specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort -u` + # Include all kinds of tests modules if --with-all-tests was specified. + inc_all_direct_tests="$inc_all_tests" + inc_all_indirect_tests="$inc_all_tests" + # Determine final module list. modules="$specified_modules" func_modules_transitive_closure if test $verbose -ge 0; then - echo "Module list with included dependencies:" - echo "$modules" | sed -e 's/^/ /' + func_show_module_list 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 excluding - # modules of applicability 'all'. 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=`for module in $main_modules; do - if test \`func_get_applicability $module\` = main; then - echo $module - fi - done \ - | 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 to the main module list if needed. - modules="$main_modules" - func_modules_add_dummy - main_modules="$modules" + func_modules_transitive_closure_separately # 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` - # Test whether some file in $all_files lies in lib/. - for f in $all_files; do - case $f in - lib/*) - use_libtests=true - break 2 - ;; - esac - done - fi - done + func_determine_use_libtests - # 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 + # Add the dummy module to the main module list or to the tests-related module + # list if needed. + func_modules_add_dummy_separately # If --lgpl, verify that the licenses of modules are compatible. if test -n "$lgpl"; then @@ -3651,11 +4532,16 @@ s,^\(.................................................[^ ]*\) *, yes | 3) sed_transform_main_lib_file=$sed_transform_main_lib_file' s/GNU General/GNU Lesser General/g + s/General Public License/Lesser General Public License/g + s/Lesser Lesser General Public License/Lesser General Public License/g ' ;; 2) sed_transform_main_lib_file=$sed_transform_main_lib_file' s/GNU General/GNU Lesser General/g + s/General Public License/Lesser General Public License/g + s/Lesser Lesser General Public License/Lesser General Public License/g + s/version [23]\([ ,]\)/version 2.1\1/g ' ;; @@ -3665,7 +4551,11 @@ s,^\(.................................................[^ ]*\) *, # Update license. sed_transform_main_lib_file=$sed_transform_main_lib_file' s/GNU Lesser General/GNU General/g + s/Lesser General Public License/General Public License/g + s/GNU Library General/GNU General/g + s/Library General Public License/General Public License/g + s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g ' fi @@ -3677,7 +4567,11 @@ s,^\(.................................................[^ ]*\) *, # Update license. sed_transform_build_aux_file=$sed_transform_build_aux_file' s/GNU Lesser General/GNU General/g + s/Lesser General Public License/General Public License/g + s/GNU Library General/GNU General/g + s/Library General Public License/General Public License/g + s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g ' fi @@ -3688,32 +4582,17 @@ s,^\(.................................................[^ ]*\) *, # Update license. sed_transform_testsrelated_lib_file=$sed_transform_testsrelated_lib_file' s/GNU Lesser General/GNU General/g + s/Lesser General Public License/General Public License/g + s/GNU Library General/GNU General/g + s/Library General Public License/General Public License/g + s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g ' fi # 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 - 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 + func_modules_to_filelist_separately test -n "$files" \ || func_fatal_error "refusing to do nothing" @@ -3755,7 +4634,7 @@ s,^\(.................................................[^ ]*\) *, if test -n "$docfiles"; then echo "$docbase" fi - if test -n "$inctests"; then + if $inctests; then echo "$testsbase" fi echo "$auxdir" @@ -3855,7 +4734,7 @@ s,^\(.................................................[^ ]*\) *, else # Install the file. # Don't protest if the file should be there but isn't: it happens - # frequently that developers don't put autogenerated files into CVS. + # frequently that developers don't put autogenerated files under version control. func_add_file func_append added_files "$g$nl" fi @@ -3904,7 +4783,7 @@ s,^\(.................................................[^ ]*\) *, func_append actioncmd " --doc-base=$docbase" func_append actioncmd " --tests-base=$testsbase" func_append actioncmd " --aux-dir=$auxdir" - if test -n "$inctests"; then + if $inctests; then func_append actioncmd " --with-tests" fi if test -n "$incobsolete"; then @@ -3938,6 +4817,11 @@ s,^\(.................................................[^ ]*\) *, if test -n "$makefile_name"; then func_append actioncmd " --makefile-name=$makefile_name" fi + if test "$cond_dependencies" = true; then + func_append actioncmd " --conditional-dependencies" + else + func_append actioncmd " --no-conditional-dependencies" + fi if test "$libtool" = true; then func_append actioncmd " --libtool" else @@ -3947,6 +4831,9 @@ s,^\(.................................................[^ ]*\) *, if test -n "$po_domain"; then func_append actioncmd " --po-domain=$po_domain" fi + if test -n "$witness_c_macro"; then + func_append actioncmd " --witness-c-macro=$witness_c_macro" + fi if test -n "$vc_files"; then if test "$vc_files" = true; then func_append actioncmd " --vc-files" @@ -3956,6 +4843,9 @@ s,^\(.................................................[^ ]*\) *, fi func_append actioncmd " `echo $specified_modules`" + # Determine include_guard_prefix. + func_compute_include_guard_prefix + # Default the makefile name to Makefile.am. if test -n "$makefile_name"; then makefile_am=$makefile_name @@ -3990,7 +4880,7 @@ s,^\(.................................................[^ ]*\) *, pobase_base=`basename "$pobase"` func_note_Makefile_am_edit "$pobase_dir" SUBDIRS "$pobase_base" fi - if test -n "$inctests"; then + if $inctests; then if test "$makefile_am" = Makefile.am; then testsbase_dir=`echo "$testsbase" | sed -n -e 's,/[^/]*$,/,p'` testsbase_base=`basename "$testsbase"` @@ -4009,7 +4899,7 @@ s,//*$,/,' && ! { test -f "${destdir}/${dir1}Makefile.am" \ || test "${dir1}Makefile.am" = "$sourcebase/$makefile_am" \ || test "./${dir1}Makefile.am" = "$sourcebase/$makefile_am" \ - || { test -n "$inctests" \ + || { $inctests \ && { test "${dir1}Makefile.am" = "$testsbase/$makefile_am" \ || test "./${dir1}Makefile.am" = "$testsbase/$makefile_am"; }; }; }; do dir2=`echo "$dir1" | sed -e "$sed_last"`"$dir2" @@ -4024,7 +4914,7 @@ s,//*$,/,' 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 + if cmp -s "$destdir"/$sourcebase/$makefile_am "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -4055,7 +4945,7 @@ s,//*$,/,' 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 + if cmp -s "$destdir"/$pobase/$file "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -4082,7 +4972,7 @@ s,//*$,/,' 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 + if cmp -s "$destdir"/$pobase/Makevars "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -4108,7 +4998,7 @@ s,//*$,/,' 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 + if cmp -s "$destdir"/$pobase/POTFILES.in "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -4157,7 +5047,7 @@ s,//*$,/,' } ) > "$tmpfile" if test -f "$destdir"/$pobase/LINGUAS; then - if cmp "$destdir"/$pobase/LINGUAS "$tmpfile" > /dev/null; then + if cmp -s "$destdir"/$pobase/LINGUAS "$tmpfile"; then rm -f "$tmpfile" else echo "Updating $pobase/LINGUAS (backup in $pobase/LINGUAS~)" @@ -4185,8 +5075,8 @@ s,//*$,/,' echo "#" echo "# This file represents the specification of how gnulib-tool is used." echo "# It acts as a cache: It is written and read by gnulib-tool." - echo "# In projects using CVS, this file is meant to be stored in CVS," - echo "# like the configure.ac and various Makefile.am files." + echo "# In projects that use version control, this file is meant to be put under" + echo "# version control, like the configure.ac and various Makefile.am files." echo echo echo "# Specification in the form of a command-line invocation:" @@ -4222,7 +5112,9 @@ s,//*$,/,' echo "gl_PO_BASE([$pobase])" echo "gl_DOC_BASE([$docbase])" echo "gl_TESTS_BASE([$testsbase])" - test -z "$inctests" || echo "gl_WITH_TESTS" + if $inctests; then + echo "gl_WITH_TESTS" + fi echo "gl_LIB([$libname])" if test -n "$lgpl"; then if test "$lgpl" = yes; then @@ -4232,17 +5124,21 @@ s,//*$,/,' fi fi echo "gl_MAKEFILE_NAME([$makefile_name])" + if test "$cond_dependencies" = true; then + echo "gl_CONDITIONAL_DEPENDENCIES" + fi if test "$libtool" = true; then echo "gl_LIBTOOL" fi echo "gl_MACRO_PREFIX([$macro_prefix])" echo "gl_PO_DOMAIN([$po_domain])" + echo "gl_WITNESS_C_MACRO([$witness_c_macro])" if test -n "$vc_files"; then echo "gl_VC_FILES([$vc_files])" fi ) > "$tmpfile" if test -f "$destdir"/$m4base/gnulib-cache.m4; then - if cmp "$destdir"/$m4base/gnulib-cache.m4 "$tmpfile" > /dev/null; then + if cmp -s "$destdir"/$m4base/gnulib-cache.m4 "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -4279,7 +5175,8 @@ s,//*$,/,' echo "# This file represents the compiled summary of the specification in" echo "# gnulib-cache.m4. It lists the computed macro invocations that need" echo "# to be invoked from configure.ac." - echo "# In projects using CVS, this file can be treated like other built files." + echo "# In projects that use version control, this file can be treated like" + echo "# other built files." echo echo echo "# This macro should be invoked from $configure_ac, in the section" @@ -4291,7 +5188,7 @@ s,//*$,/,' echo " m4_pattern_allow([^gl_ES\$])dnl a valid locale name" echo " m4_pattern_allow([^gl_LIBOBJS\$])dnl a variable" echo " m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable" - echo " AC_REQUIRE([AC_PROG_RANLIB])" + echo " AC_REQUIRE([gl_PROG_AR_RANLIB])" if test -n "$uses_subdirs"; then echo " AC_REQUIRE([AM_PROG_CC_C_O])" fi @@ -4328,24 +5225,16 @@ s,//*$,/,' else sed_replace_build_aux="$sed_noop" fi + echo " gl_m4_base='$m4base'" 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 - echo " # Code from module $module:" - 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" - if test "$module" = 'alloca' && test "$libtool" = true; then - echo 'changequote(,)dnl' - echo 'LTALLOCA=`echo "$ALLOCA" | sed -e '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' - echo 'changequote([, ])dnl' - echo 'AC_SUBST([LTALLOCA])' - fi - fi - done + if test -n "$witness_c_macro"; then + echo " m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$witness_c_macro])" + fi + func_emit_autoconf_snippets "$main_modules" func_verify_module true false true + if test -n "$witness_c_macro"; then + echo " m4_popdef([gl_MODULE_INDICATOR_CONDITION])" + fi echo " # End of code from modules" func_emit_initmacro_end $macro_prefix echo " gltests_libdeps=" @@ -4356,29 +5245,18 @@ s,//*$,/,' # PACKAGE is defined by AM_INIT_AUTOMAKE, PACKAGE_TARNAME is defined by AC_INIT. # See . echo "changequote(,)dnl" - echo " ${macro_prefix}tests_WITNESS=IN_\`echo \"\${PACKAGE-\$PACKAGE_TARNAME}\" | LC_ALL=C tr 'a-z' 'A-Z' | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'\`_GNULIB_TESTS" + echo " ${macro_prefix}tests_WITNESS=IN_\`echo \"\${PACKAGE-\$PACKAGE_TARNAME}\" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'\`_GNULIB_TESTS" echo "changequote([, ])dnl" echo " AC_SUBST([${macro_prefix}tests_WITNESS])" echo " gl_module_indicator_condition=\$${macro_prefix}tests_WITNESS" echo " m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [\$gl_module_indicator_condition])" - 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_autoconf_snippets "$testsrelated_modules" func_verify_module true true true echo " m4_popdef([gl_MODULE_INDICATOR_CONDITION])" 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\"" @@ -4399,7 +5277,7 @@ s,//*$,/,' echo "])" ) > "$tmpfile" if test -f "$destdir"/$m4base/gnulib-comp.m4; then - if cmp "$destdir"/$m4base/gnulib-comp.m4 "$tmpfile" > /dev/null; then + if cmp -s "$destdir"/$m4base/gnulib-comp.m4 "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -4427,14 +5305,14 @@ s,//*$,/,' fi fi - if test -n "$inctests"; then + if $inctests; then # Create tests makefile. func_dest_tmpfilename $testsbase/$makefile_am destfile="$testsbase/$makefile_am" modules="$testsrelated_modules" func_emit_tests_Makefile_am "${macro_prefix}tests_WITNESS" > "$tmpfile" if test -f "$destdir"/$testsbase/$makefile_am; then - if cmp "$destdir"/$testsbase/$makefile_am "$tmpfile" > /dev/null; then + if cmp -s "$destdir"/$testsbase/$makefile_am "$tmpfile"; then rm -f "$tmpfile" else if $doit; then @@ -4454,7 +5332,7 @@ s,//*$,/,' echo "Create $testsbase/$makefile_am" rm -f "$tmpfile" fi - func_append added_files "$testsbase/$makefile_am$nl" + func_append added_files "$testsbase/$makefile_am$nl" fi fi @@ -4488,7 +5366,7 @@ s,//*$,/,' (echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \ | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-added echo "$dir_removed" | sed -e '/^$/d' | LC_ALL=C sort -u \ - | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-removed + > "$tmp"/ignore-removed ) if test -s "$tmp"/ignore-added || test -s "$tmp"/ignore-removed; then if $doit; then @@ -4615,7 +5493,7 @@ s,//*$,/,' if test -n "$pobase"; then echo " - add \"$pobase/Makefile.in\" to AC_CONFIG_FILES in $configure_ac," fi - if test -n "$inctests"; then + if $inctests; then if test "$makefile_am" = Makefile.am; then echo " - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in $configure_ac," else @@ -4632,7 +5510,16 @@ s,//*$,/,' echo " - mention \"${val}\" in ${var} in ${dir}Makefile.am," fi done - echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after AC_PROG_CC," + if grep '^ *AC_PROG_CC_STDC' "$configure_ac" > /dev/null; then + position_early_after=AC_PROG_CC_STDC + else + if grep '^ *AC_PROG_CC_C99' "$configure_ac" > /dev/null; then + position_early_after=AC_PROG_CC_C99 + else + position_early_after=AC_PROG_CC + fi + fi + echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after $position_early_after," echo " - invoke ${macro_prefix}_INIT in $configure_ac." } @@ -4641,10 +5528,22 @@ s,//*$,/,' # - local_gnulib_dir from --local-dir # - modcache true or false, from --cache-modules/--no-cache-modules # - auxdir directory relative to destdir where to place build aux files -# - inctests true if tests should be included, blank otherwise +# - inctests true if tests should be included, false otherwise # - incobsolete true if obsolete modules among dependencies should be # included, blank otherwise +# - excl_cxx_tests true if C++ interoperability tests should be excluded, +# blank otherwise +# - excl_longrunning_tests true if long-runnings tests should be excluded, +# blank otherwise +# - excl_privileged_tests true if tests that require root privileges should be +# excluded, blank otherwise +# - excl_unportable_tests true if tests that fail on some platforms should be +# excluded, blank otherwise +# - single_configure true if a single configure file should be generated, +# false for a separate configure file for the tests # - avoidlist list of modules to avoid +# - cond_dependencies true if --conditional-dependencies was given, false if +# --no-conditional-dependencies was given, blank otherwise # - libtool true if --libtool was given, false if --no-libtool was # given, blank otherwise # - symbolic true if files should be symlinked, copied otherwise @@ -4662,20 +5561,24 @@ func_create_testdir () modules=`func_all_modules` modules=`for m in $modules; do case $m in config-h | ftruncate | mountlist | lib-ignore) ;; *) echo $m;; esac; done` fi - modules=`for m in $modules; do echo $m; done | LC_ALL=C sort -u` + specified_modules="$modules" - # Unlike in func_import, here we want to include all kinds of tests. - inc_all_tests=true + # Canonicalize the list of specified modules. + specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort -u` + + # Unlike in func_import, here we want to include all kinds of tests for the + # directly specified modules, but not for dependencies. + inc_all_direct_tests=true + inc_all_indirect_tests="$inc_all_tests" # Check that the license of every module is consistent with the license of # its dependencies. - saved_modules="$modules" saved_inctests="$inctests" # When computing transitive closures, don't consider $module to depend on - # $module-tests. Need this becauses tests are implicitly GPL and may depend + # $module-tests. Need this because tests are implicitly GPL and may depend # on GPL modules - therefore we don't want a warning in this case. - inctests="" - for requested_module in $saved_modules; do + inctests=false + for requested_module in $specified_modules; do requested_license=`func_get_license "$requested_module"` if test "$requested_license" != GPL; then # Here we use func_modules_transitive_closure, not just @@ -4715,7 +5618,6 @@ func_create_testdir () done fi done - modules="$saved_modules" inctests="$saved_inctests" # Subdirectory names. @@ -4726,27 +5628,57 @@ func_create_testdir () testsbase=gltests macro_prefix=gl po_domain= + witness_c_macro= vc_files= # Determine final module list. + modules="$specified_modules" func_modules_transitive_closure if test $verbose -ge 0; then - echo "Module list with included dependencies:" - echo "$modules" | sed -e 's/^/ /' + func_show_module_list + fi + final_modules="$modules" + + if $single_configure; then + # Determine main module list and tests-related module list separately. + func_modules_transitive_closure_separately + fi + + if $single_configure; then + # Determine whether a $testsbase/libtests.a is needed. + func_determine_use_libtests fi # Add the dummy module if needed. - func_modules_add_dummy + if $single_configure; then + func_modules_add_dummy_separately + else + func_modules_add_dummy + fi # Show banner notice of every module. - func_modules_notice + if $single_configure; then + modules="$main_modules" + func_modules_notice + else + func_modules_notice + fi # Determine final file list. - func_modules_to_filelist - if test $verbose -ge 0; then - echo "File list:" - echo "$files" | sed -e 's/^/ /' + if $single_configure; then + func_modules_to_filelist_separately + else + func_modules_to_filelist + if test $verbose -ge 0; then + echo "File list:" + echo "$files" | sed -e 's/^/ /' + fi fi + # Add files for which the copy in gnulib is newer than the one that + # "automake --add-missing --copy" would provide. + files="$files build-aux/config.guess" + files="$files build-aux/config.sub" + files=`for f in $files; do echo $f; done | LC_ALL=C sort -u` rewritten='%REWRITTEN%' sed_rewrite_files="\ @@ -4755,6 +5687,7 @@ func_create_testdir () s,^lib/,$rewritten$sourcebase/, s,^m4/,$rewritten$m4base/, s,^tests/,$rewritten$testsbase/, + s,^tests=lib/,$rewritten$testsbase/, s,^top/,$rewritten, s,^$rewritten,," @@ -4783,6 +5716,9 @@ func_create_testdir () # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. exec 5<&0 < "$tmp"/files while read g f; do + case "$f" in + tests=lib/*) f=`echo "$f" | sed -e 's,^tests=lib/,lib/,'` ;; + esac func_lookup_file "$f" if test -n "$lookedup_tmp"; then cp -p "$lookedup_file" "$testdir/$g" @@ -4800,6 +5736,9 @@ func_create_testdir () exec 0<&5 5<&- } + # Determine include_guard_prefix. + func_compute_include_guard_prefix + # Create Makefile.ams that are for testing. for_test=true @@ -4809,6 +5748,9 @@ func_create_testdir () # Create $sourcebase/Makefile.am. mkdir -p "$testdir/$sourcebase" destfile="$sourcebase/Makefile.am" + if $single_configure; then + modules="$main_modules" + fi func_emit_lib_Makefile_am > "$testdir/$sourcebase/Makefile.am" any_uses_subdirs="$uses_subdirs" @@ -4837,130 +5779,119 @@ func_create_testdir () func_append subdirs " po" fi - if test -n "$inctests"; then + if $inctests; then test -d "$testdir/$testsbase" || mkdir "$testdir/$testsbase" - # Viewed from the $testsbase subdirectory, $auxdir is different. - saved_auxdir="$auxdir" - auxdir=`echo "$testsbase/" | sed -e 's%[^/][^/]*//*%../%g'`"$auxdir" - # Create $testsbase/Makefile.am. - use_libtests=false - destfile="$testsbase/Makefile.am" - 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 "AM_INIT_AUTOMAKE" - echo - echo "AC_CONFIG_HEADERS([config.h])" - echo - echo "AC_PROG_CC" - echo "AC_PROG_INSTALL" - echo "AC_PROG_MAKE_SET" - echo "AC_PROG_RANLIB" - echo - if test -n "$uses_subdirs"; then - echo "AM_PROG_CC_C_O" + if $single_configure; then + # Create $testsbase/Makefile.am. + destfile="$testsbase/Makefile.am" + modules="$testsrelated_modules" + func_emit_tests_Makefile_am "${macro_prefix}tests_WITNESS" > "$testdir/$testsbase/Makefile.am" + else + # Viewed from the $testsbase subdirectory, $auxdir is different. + saved_auxdir="$auxdir" + auxdir=`echo "$testsbase/" | sed -e 's%[^/][^/]*//*%../%g'`"$auxdir" + # Create $testsbase/Makefile.am. + use_libtests=false + destfile="$testsbase/Makefile.am" + 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 "AM_INIT_AUTOMAKE" echo - fi - for module in $modules; do - func_verify_module - if test -n "$module"; then - case $module in - gnumakefile | maintainer-makefile) - # These modules are meant to be used only in the top-level directory. - ;; - *) - func_get_autoconf_early_snippet "$module" - ;; - esac + echo "AC_CONFIG_HEADERS([config.h])" + echo + echo "AC_PROG_CC" + echo "AC_PROG_INSTALL" + echo "AC_PROG_MAKE_SET" + echo "gl_PROG_AR_RANLIB" + echo + if test -n "$uses_subdirs"; then + echo "AM_PROG_CC_C_O" + echo fi - done \ - | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' - if test "$libtool" = true; then - echo "LT_INIT([win32-dll])" - echo "LT_LANG([C++])" - echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" - echo "gl_cond_libtool=true" - else - echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" - echo "gl_cond_libtool=false" - echo "gl_libdeps=" - echo "gl_ltlibdeps=" - fi - # 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: - # error: AC_REQUIRE(gt_CSHARPCOMP): cannot be used outside of an AC_DEFUN'd macro - # but we want the AC_REQUIRE to have its normal meaning (provide one - # expansion of the required macro before the current point, and only one - # expansion total). - echo "AC_DEFUN([gl_INIT], [" - sed_replace_build_aux=' - :a - /AC_CONFIG_FILES(.*:build-aux\/.*)/{ - 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. - echo "gl_source_base='../$sourcebase'" - for module in $modules; do - func_verify_nontests_module - if test -n "$module"; then - case $module in - gnumakefile | maintainer-makefile) - # These modules are meant to be used only in the top-level directory. - ;; - *) - func_get_autoconf_snippet "$module" \ - | sed -e "$sed_replace_build_aux" - ;; - esac + for module in $modules; do + func_verify_module + if test -n "$module"; then + case $module in + gnumakefile | maintainer-makefile) + # These modules are meant to be used only in the top-level directory. + ;; + *) + func_get_autoconf_early_snippet "$module" + ;; + esac + fi + done \ + | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' + if test "$libtool" = true; then + echo "LT_INIT([win32-dll])" + echo "LT_LANG([C++])" + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" + echo "gl_cond_libtool=true" + else + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" + echo "gl_cond_libtool=false" + echo "gl_libdeps=" + echo "gl_ltlibdeps=" fi - done - echo "gl_source_base='.'" - for module in $modules; do - func_verify_tests_module - if test -n "$module"; then - func_get_autoconf_snippet "$module" \ - | sed -e "$sed_replace_build_aux" + # 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: + # error: AC_REQUIRE(gt_CSHARPCOMP): cannot be used outside of an AC_DEFUN'd macro + # but we want the AC_REQUIRE to have its normal meaning (provide one + # expansion of the required macro before the current point, and only one + # expansion total). + echo "AC_DEFUN([gl_INIT], [" + sed_replace_build_aux=' + :a + /AC_CONFIG_FILES(.*:build-aux\/.*)/{ + s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| + ba + }' + echo "gl_m4_base='../$m4base'" + 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. + echo "gl_source_base='../$sourcebase'" + func_emit_autoconf_snippets "$modules" func_verify_nontests_module false false false + echo "gl_source_base='.'" + func_emit_autoconf_snippets "$modules" func_verify_tests_module false false false + 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]_'` + 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 - 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_'` - 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 - echo "])" - func_emit_initmacro_done $macro_prefix $sourcebase # FIXME use $sourcebase or $testsbase? - echo - echo "gl_INIT" - echo - # Usually $testsbase/config.h will be a superset of config.h. Verify this - # by "merging" config.h into $testsbase/config.h; look out for gcc warnings. - echo "AH_TOP([#include \"../config.h\"])" - echo - echo "AC_CONFIG_FILES([Makefile])" - echo "AC_OUTPUT" - ) > "$testdir/$testsbase/configure.ac" - auxdir="$saved_auxdir" + echo "])" + func_emit_initmacro_done $macro_prefix $sourcebase # FIXME use $sourcebase or $testsbase? + echo + echo "gl_INIT" + echo + # Usually $testsbase/config.h will be a superset of config.h. Verify this + # by "merging" config.h into $testsbase/config.h; look out for gcc warnings. + echo "AH_TOP([#include \"../config.h\"])" + echo + echo "AC_CONFIG_FILES([Makefile])" + echo "AC_OUTPUT" + ) > "$testdir/$testsbase/configure.ac" + auxdir="$saved_auxdir" + subdirs_with_configure_ac="$subdirs_with_configure_ac $testsbase" + fi func_append subdirs " $testsbase" - subdirs_with_configure_ac="$subdirs_with_configure_ac $testsbase" fi # Create Makefile.am. (echo "## Process this file with automake to produce Makefile.in." echo - echo "AUTOMAKE_OPTIONS = 1.5 foreign" + echo "AUTOMAKE_OPTIONS = 1.9.6 foreign" echo echo "SUBDIRS = $subdirs" echo @@ -4990,14 +5921,18 @@ func_create_testdir () echo "m4_pattern_allow([^gl_LIBOBJS\$])dnl a variable" echo "m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable" echo - echo "AC_PROG_RANLIB" + echo "gl_PROG_AR_RANLIB" echo if test -n "$any_uses_subdirs"; then echo "AM_PROG_CC_C_O" echo fi - for module in $modules; do - func_verify_nontests_module + for module in $final_modules; do + if $single_configure; then + func_verify_module + else + func_verify_nontests_module + fi if test -n "$module"; then func_get_autoconf_early_snippet "$module" fi @@ -5032,27 +5967,49 @@ func_create_testdir () else sed_replace_build_aux="$sed_noop" fi + echo "gl_m4_base='$m4base'" 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 - func_get_autoconf_snippet "$module" \ - | sed -e "$sed_replace_build_aux" - fi - done + if $single_configure; then + func_emit_autoconf_snippets "$main_modules" func_verify_module true false false + else + func_emit_autoconf_snippets "$modules" func_verify_nontests_module true false false + fi func_emit_initmacro_end $macro_prefix + if $single_configure; then + echo " gltests_libdeps=" + echo " gltests_ltlibdeps=" + func_emit_initmacro_start ${macro_prefix}tests + echo " gl_source_base='$testsbase'" + # Define a tests witness macro. + echo " ${macro_prefix}tests_WITNESS=IN_GNULIB_TESTS" + echo " AC_SUBST([${macro_prefix}tests_WITNESS])" + echo " gl_module_indicator_condition=\$${macro_prefix}tests_WITNESS" + echo " m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [\$gl_module_indicator_condition])" + func_emit_autoconf_snippets "$testsrelated_modules" func_verify_module true false false + echo " m4_popdef([gl_MODULE_INDICATOR_CONDITION])" + func_emit_initmacro_end ${macro_prefix}tests + fi # _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 + if $single_configure; then + if $use_libtests; then + echo " LIBTESTS_LIBDEPS=\"\$gltests_libdeps\"" + echo " AC_SUBST([LIBTESTS_LIBDEPS])" + fi + fi echo "])" func_emit_initmacro_done $macro_prefix $sourcebase + if $single_configure; then + func_emit_initmacro_done ${macro_prefix}tests $testsbase + fi echo echo "gl_INIT" echo @@ -5095,7 +6052,7 @@ func_create_testdir () 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 + if $inctests && ! $single_configure; then # Create autogenerated files. (cd "$testdir/$testsbase" || func_exit 1 # Do not use "${AUTORECONF} --force --install", because it may invoke @@ -5118,14 +6075,14 @@ func_create_testdir () ) || func_exit 1 fi # Need to run configure and make once, to create built files that are to be - # distributed (such as getdate.c). + # distributed (such as parse-datetime.c). + sed_remove_make_variables='s,[$]([A-Za-z0-9_]*),,g' # Extract the value of "CLEANFILES += ..." and "MOSTLYCLEANFILES += ...". cleaned_files=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \ | sed -n -e 's,^CLEANFILES[ ]*+=\([^#]*\).*$,\1,p' -e 's,^MOSTLYCLEANFILES[ ]*+=\([^#]*\).*$,\1,p'` cleaned_files=`for file in $cleaned_files; do echo " $file "; done` # Extract the value of "BUILT_SOURCES += ...". Remove variable references # such $(FOO_H) because they don't refer to distributed files. - sed_remove_make_variables='s,[$]([A-Za-z0-9_]*),,g' built_sources=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \ | sed -n -e 's,^BUILT_SOURCES[ ]*+=\([^#]*\).*$,\1,p' \ | sed -e "$sed_remove_make_variables"` @@ -5135,14 +6092,44 @@ func_create_testdir () *) echo $file ;; esac; done` - if test -n "$distributed_built_sources"; then + tests_distributed_built_sources= + if $inctests; then + # Likewise for built files in the $testsbase directory. + tests_cleaned_files=`sed -e "$sed_remove_backslash_newline" < "$testdir/$testsbase/Makefile.am" \ + | sed -n -e 's,^CLEANFILES[ ]*+=\([^#]*\).*$,\1,p' -e 's,^MOSTLYCLEANFILES[ ]*+=\([^#]*\).*$,\1,p'` + tests_cleaned_files=`for file in $tests_cleaned_files; do echo " $file "; done` + tests_built_sources=`sed -e "$sed_remove_backslash_newline" < "$testdir/$testsbase/Makefile.am" \ + | sed -n -e 's,^BUILT_SOURCES[ ]*+=\([^#]*\).*$,\1,p' \ + | sed -e "$sed_remove_make_variables"` + tests_distributed_built_sources=`for file in $tests_built_sources; do + case "$tests_cleaned_files" in + *" "$file" "*) ;; + *) echo $file ;; + esac; + done` + fi + if test -n "$distributed_built_sources" || test -n "$tests_distributed_built_sources"; then (cd "$testdir" ./configure || func_exit 1 - cd "$sourcebase" - echo 'built_sources: $(BUILT_SOURCES)' >> Makefile - $MAKE built_sources || func_exit 1 - cd .. - $MAKE distclean || func_exit 1 + if test -n "$distributed_built_sources"; then + cd "$sourcebase" + echo 'built_sources: $(BUILT_SOURCES)' >> Makefile + $MAKE AUTOCONF="${AUTOCONF}" AUTOHEADER="${AUTOHEADER}" ACLOCAL="${ACLOCAL}" AUTOMAKE="${AUTOMAKE}" AUTORECONF="${AUTORECONF}" AUTOPOINT="${AUTOPOINT}" LIBTOOLIZE="${LIBTOOLIZE}" \ + built_sources \ + || func_exit 1 + cd .. + fi + if test -n "$tests_distributed_built_sources"; then + cd "$testsbase" + echo 'built_sources: $(BUILT_SOURCES)' >> Makefile + $MAKE AUTOCONF="${AUTOCONF}" AUTOHEADER="${AUTOHEADER}" ACLOCAL="${ACLOCAL}" AUTOMAKE="${AUTOMAKE}" AUTORECONF="${AUTORECONF}" AUTOPOINT="${AUTOPOINT}" LIBTOOLIZE="${LIBTOOLIZE}" \ + built_sources \ + || func_exit 1 + cd .. + fi + $MAKE AUTOCONF="${AUTOCONF}" AUTOHEADER="${AUTOHEADER}" ACLOCAL="${ACLOCAL}" AUTOMAKE="${AUTOMAKE}" AUTORECONF="${AUTORECONF}" AUTOPOINT="${AUTOPOINT}" LIBTOOLIZE="${LIBTOOLIZE}" \ + distclean \ + || func_exit 1 ) || func_exit 1 fi } @@ -5173,11 +6160,7 @@ func_create_megatestdir () func_append megasubdirs "ALL" # Create autobuild. - 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; \ + cvsdate=`vc_witness="$gnulib_dir/.git/refs/heads/master"; \ 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,' \ @@ -5217,7 +6200,7 @@ func_create_megatestdir () # Create Makefile.am. (echo "## Process this file with automake to produce Makefile.in." echo - echo "AUTOMAKE_OPTIONS = 1.5 foreign" + echo "AUTOMAKE_OPTIONS = 1.9.6 foreign" echo echo "SUBDIRS = $megasubdirs" echo @@ -5293,7 +6276,7 @@ s/\([.*$]\)/[\1]/g' done ;; - import | update ) + import | add-import | remove-import | update ) # Where to import. if test -z "$destdir"; then @@ -5333,94 +6316,110 @@ s/\([.*$]\)/[\1]/g' fi # Determine where to apply func_import. - if test -n "$m4base"; then + if test "$mode" = import; then # Apply func_import to a particular gnulib directory. - # Any number of additional modules can be given. - if test ! -f "$destdir/$m4base"/gnulib-cache.m4; then - # First use of gnulib in the given m4base. - test -n "$supplied_libname" || supplied_libname=true - test -n "$sourcebase" || sourcebase="lib" - test -n "$docbase" || docbase="doc" - test -n "$testsbase" || testsbase="tests" - test -n "$macro_prefix" || macro_prefix="gl" - fi + # The command line contains the complete specification; don't look at + # the contents of gnulib-cache.m4. + test -n "$supplied_libname" || supplied_libname=true + test -n "$sourcebase" || sourcebase="lib" + test -n "$m4base" || m4base="m4" + test -n "$docbase" || docbase="doc" + test -n "$testsbase" || testsbase="tests" + test -n "$macro_prefix" || macro_prefix="gl" func_import "$*" else - # Apply func_import to all gnulib directories. - # To get this list of directories, look at Makefile.am. (Not at - # configure, because it may be omitted from CVS. Also, don't run - # "find $destdir -name gnulib-cache.m4", as it might be too expensive.) - m4dirs= - m4dirs_count=0 - if test -f "$destdir"/Makefile.am; then - aclocal_amflags=`sed -n -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/p' "$destdir"/Makefile.am` - m4dir_is_next= - for arg in $aclocal_amflags; do - if test -n "$m4dir_is_next"; then - # Ignore absolute directory pathnames, like /usr/local/share/aclocal. - case "$arg" in - /*) ;; - *) - if test -f "$destdir/$arg"/gnulib-cache.m4; then - func_append m4dirs " $arg" - m4dirs_count=`expr $m4dirs_count + 1` - fi - ;; - esac - m4dir_is_next= - else - if test "X$arg" = "X-I"; then - m4dir_is_next=yes - else + if test -n "$m4base"; then + # Apply func_import to a particular gnulib directory. + # Any number of additional modules can be given. + if test ! -f "$destdir/$m4base"/gnulib-cache.m4; then + # First use of gnulib in the given m4base. + test -n "$supplied_libname" || supplied_libname=true + test -n "$sourcebase" || sourcebase="lib" + test -n "$docbase" || docbase="doc" + test -n "$testsbase" || testsbase="tests" + test -n "$macro_prefix" || macro_prefix="gl" + fi + func_import "$*" + else + # Apply func_import to all gnulib directories. + # To get this list of directories, look at Makefile.am. (Not at + # configure, because it may be omitted from version control. Also, + # don't run "find $destdir -name gnulib-cache.m4", as it might be + # too expensive.) + m4dirs= + m4dirs_count=0 + if test -f "$destdir"/Makefile.am; then + aclocal_amflags=`sed -n -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/p' "$destdir"/Makefile.am` + m4dir_is_next= + for arg in $aclocal_amflags; do + if test -n "$m4dir_is_next"; then + # Ignore absolute directory pathnames, like /usr/local/share/aclocal. + case "$arg" in + /*) ;; + *) + if test -f "$destdir/$arg"/gnulib-cache.m4; then + func_append m4dirs " $arg" + m4dirs_count=`expr $m4dirs_count + 1` + fi + ;; + esac m4dir_is_next= + else + if test "X$arg" = "X-I"; then + m4dir_is_next=yes + else + m4dir_is_next= + fi fi + done + else + # No Makefile.am! Oh well. Look at the last generated aclocal.m4. + if test -f "$destdir"/aclocal.m4; then + sedexpr1='s,^m4_include(\[\(.*\)])$,\1,p' + sedexpr2='s,^[^/]*$,.,' + sedexpr3='s,/[^/]*$,,' + m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort -u` + m4dirs=`for arg in $m4dirs; do if test -f "$destdir/$arg"/gnulib-cache.m4; then echo $arg; fi; done` + m4dirs_count=`for arg in $m4dirs; do echo "$arg"; done | wc -l` fi - done - else - # No Makefile.am! Oh well. Look at the last generated aclocal.m4. - if test -f "$destdir"/aclocal.m4; then - sedexpr1='s,^m4_include(\[\(.*\)])$,\1,p' - sedexpr2='s,^[^/]*$,.,' - sedexpr3='s,/[^/]*$,,' - m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort -u` - m4dirs_count=`printf %s "$m4dirs" | wc -l` fi - fi - if test $m4dirs_count = 0; then - # First use of gnulib in a package. - # Any number of additional modules can be given. - test -n "$supplied_libname" || supplied_libname=true - test -n "$sourcebase" || sourcebase="lib" - m4base="m4" - test -n "$docbase" || docbase="doc" - test -n "$testsbase" || testsbase="tests" - test -n "$macro_prefix" || macro_prefix="gl" - func_import "$*" - else - if test $m4dirs_count = 1; then - # There's only one use of gnulib here. Assume the user means it. + if test $m4dirs_count = 0; then + # First use of gnulib in a package. # Any number of additional modules can be given. - for m4base in $m4dirs; do - func_import "$*" - done + test -n "$supplied_libname" || supplied_libname=true + test -n "$sourcebase" || sourcebase="lib" + m4base="m4" + test -n "$docbase" || docbase="doc" + test -n "$testsbase" || testsbase="tests" + test -n "$macro_prefix" || macro_prefix="gl" + func_import "$*" else - # Ambiguous - guess what the user meant. - if test $# = 0; then - # No further arguments. Guess the user wants to update all of them. + if test $m4dirs_count = 1; then + # There's only one use of gnulib here. Assume the user means it. + # Any number of additional modules can be given. for m4base in $m4dirs; do - # Perform func_import in a subshell, so that variable values - # such as - # local_gnulib_dir, incobsolete, inc_cxx_tests, - # inc_longrunning_tests, inc_privileged_tests, - # inc_unportable_tests, inc_all_tests, avoidlist, sourcebase, - # m4base, pobase, docbase, testsbase, inctests, libname, lgpl, - # makefile_name, libtool, macro_prefix, po_domain, vc_files - # don't propagate from one directory to another. - (func_import) || func_exit 1 + func_import "$*" done else - # Really ambiguous. - func_fatal_error "Ambiguity: to which directory should the modules be added? Please specify at least --m4-base=..." + # Ambiguous - guess what the user meant. + if test $# = 0; then + # No further arguments. Guess the user wants to update all of them. + for m4base in $m4dirs; do + # Perform func_import in a subshell, so that variable values + # such as + # local_gnulib_dir, incobsolete, inc_cxx_tests, + # inc_longrunning_tests, inc_privileged_tests, + # inc_unportable_tests, inc_all_tests, avoidlist, sourcebase, + # m4base, pobase, docbase, testsbase, inctests, libname, lgpl, + # makefile_name, libtool, macro_prefix, po_domain, + # witness_c_macro, vc_files + # don't propagate from one directory to another. + (func_import) || func_exit 1 + done + else + # Really ambiguous. + func_fatal_error "Ambiguity: to which directory should the modules be added? Please specify at least --m4-base=..." + fi fi fi fi @@ -5554,6 +6553,9 @@ s/\([.*$]\)/[\1]/g' ;; extract-dependencies ) + if test -n "$avoidlist"; then + func_fatal_error "cannot combine --avoid and --extract-dependencies" + fi for module do func_verify_module @@ -5687,7 +6689,8 @@ s/\([.*$]\)/[\1]/g' else # Install the file. # Don't protest if the file should be there but isn't: it happens - # frequently that developers don't put autogenerated files into CVS. + # frequently that developers don't put autogenerated files under version + # control. func_add_file fi rm -f "$tmpfile"