X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=ef2bd46b718497367f6a6f064b6f7cee1b20424e;hb=dbb3c91f97905f9ef30ca8ea52d5cf2a862e7762;hp=0b059e124b3db10926552e8e3126f7c68c9aeb94;hpb=9906724714b8aed251548c1c07860f96f18e10c4;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index 0b059e124..ef2bd46b7 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2002-2009 Free Software Foundation, Inc. +# Copyright (C) 2002-2010 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 @@ -100,12 +100,24 @@ fi # An empty expression does not work with the native 'sed' on AIX 6.1. 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.) +if echo fo | sed -e 's/f/g/ +# s/o/u/ +s/o/e/' 2>/dev/null | grep ge > /dev/null; then + sed_comments=true +else + sed_comments=false +fi + # func_usage # outputs to stdout the --help usage message. func_usage () { echo "\ Usage: gnulib-tool --list + gnulib-tool --find filename gnulib-tool --import [module1 ... moduleN] gnulib-tool --update gnulib-tool --create-testdir --dir=directory [module1 ... moduleN] @@ -115,6 +127,7 @@ Usage: gnulib-tool --list gnulib-tool --extract-description module gnulib-tool --extract-status module gnulib-tool --extract-notice module + gnulib-tool --extract-applicability module gnulib-tool --extract-filelist module gnulib-tool --extract-dependencies module gnulib-tool --extract-autoconf-snippet module @@ -128,6 +141,7 @@ Usage: gnulib-tool --list 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; if no modules are specified, update the current package from the current gnulib @@ -162,6 +176,8 @@ General options: directory. --local-dir=DIRECTORY Specify a local override directory where to look up files before looking in gnulib's directory. + --cache-modules Enable module caching optimization. + --no-cache-modules Disable module caching optimization. --verbose Increase verbosity. May be repeated. --quiet Decrease verbosity. May be repeated. @@ -252,7 +268,7 @@ q fi version= fi - year=`"$gnulib_dir"/build-aux/mdate-sh "$self_abspathname" | sed 's,^.* ,,'` + year=`"$gnulib_dir"/build-aux/mdate-sh "$self_abspathname" | sed -e 's,^.* ,,'` echo "\ gnulib-tool (GNU $package $date)$version Copyright (C) $year Free Software Foundation, Inc. @@ -267,10 +283,10 @@ Written by" "Bruno Haible" "and" "Simon Josefsson" # outputs to stdout a header for a generated file. func_emit_copyright_notice () { - sed -n '/Copyright/ { - p - q - }' < "$self_abspathname" + sed -n -e '/Copyright/ { + p + 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" @@ -489,6 +505,13 @@ func_fatal_error () func_exit 1 } +# func_warning message +# Outputs to stderr a warning message, +func_warning () +{ + echo "gnulib-tool: warning: $1" 1>&2 +} + # func_readlink SYMLINK # outputs the target of the given symlink. if (type -p readlink) > /dev/null 2>&1; then @@ -703,7 +726,7 @@ if test -z "$have_echo" \ && test "X$1" != "X--no-reexec" \ && test -n "$CONFIG_SHELL" \ && test -f "$CONFIG_SHELL" \ - && $CONFIG_SHELL -c 'echo '\t' | grep t > /dev/null'; then + && $CONFIG_SHELL -c "echo '\\t' | grep t > /dev/null"; then exec $CONFIG_SHELL "$0" --no-reexec "$@" exit 127 fi @@ -817,6 +840,7 @@ fi # - mode list or import or create-testdir or create-megatestdir # - destdir from --dir # - 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, supplied_libname from --lib # - sourcebase from --source-base @@ -847,6 +871,7 @@ fi mode= destdir= local_gnulib_dir= + modcache=true verbose=0 libname=libgnu supplied_libname= @@ -878,6 +903,9 @@ fi --list | --lis ) mode=list shift ;; + --find | --fin | --fi | --f ) + mode=find + shift ;; --import | --impor | --impo | --imp | --im | --i ) mode=import shift ;; @@ -922,6 +950,12 @@ fi --local-dir=* ) local_gnulib_dir=`echo "X$1" | sed -e 's/^X--local-dir=//'` shift ;; + --cache-modules | --cache-module | --cache-modul | --cache-modu | --cache-mod | --cache-mo | --cache-m | --cache- | --cache | --cach | --cac | --ca ) + modcache=true + shift ;; + --no-cache-modules | --no-cache-module | --no-cache-modul | --no-cache-modu | --no-cache-mod | --no-cache-mo | --no-cache-m | --no-cache- | --no-cache | --no-cach | --no-cac | --no-ca ) + modcache=false + shift ;; --verbose | --verbos | --verbo | --verb ) verbose=`expr $verbose + 1` shift ;; @@ -1070,7 +1104,7 @@ fi --no-vc-files ) vc_files=false shift ;; - --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch | --no-c ) + --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch ) do_changelog=false shift ;; --dry-run ) @@ -1134,7 +1168,7 @@ fi func_exit 1 fi if test -z "$pobase" && test -n "$po_domain"; then - echo "gnulib-tool: warning: --po-domain has no effect without a --po-base option" 1>&2 + func_warning "--po-domain has no effect without a --po-base option" fi # Determine the minimum supported autoconf version from the project's @@ -1177,7 +1211,7 @@ fi if test -n "$prereqs"; then autoconf_minversion=` for version in $prereqs; do echo $version; done | - LC_ALL=C sort -nru | sed 1q + LC_ALL=C sort -nru | sed -e 1q ` fi fi @@ -1262,6 +1296,23 @@ func_lookup_file () fi } +# func_sanitize_modulelist +# receives a list of possible module names on standard input, one per line. +# It removes those which are just file names unrelated to modules, and outputs +# 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' \ + -e '/^COPYING$/d' -e '/\/COPYING$/d' \ + -e '/^README$/d' -e '/\/README$/d' \ + -e '/^TEMPLATE$/d' \ + -e '/^TEMPLATE-EXTENDED$/d' \ + -e '/^TEMPLATE-TESTS$/d' \ + -e '/^\..*/d' \ + -e '/~$/d' +} + # func_all_modules # Input: # - local_gnulib_dir from --local-dir @@ -1276,15 +1327,7 @@ func_all_modules () (cd "$local_gnulib_dir" && find modules -type f -print | sed -e 's,^modules/,,' -e 's,\.diff$,,') fi } \ - | sed -e '/^CVS\//d' -e '/\/CVS\//d' \ - -e '/^ChangeLog$/d' -e '/\/ChangeLog$/d' \ - -e '/^COPYING$/d' -e '/\/COPYING$/d' \ - -e '/^README$/d' -e '/\/README$/d' \ - -e '/^TEMPLATE$/d' \ - -e '/^TEMPLATE-EXTENDED$/d' \ - -e '/^TEMPLATE-TESTS$/d' \ - -e '/^\..*/d' \ - -e '/~$/d' \ + | func_sanitize_modulelist \ | sed -e '/-tests$/d' \ | LC_ALL=C sort -u } @@ -1310,7 +1353,7 @@ func_verify_module () # Verify that building the module description with 'patch' succeeds. func_lookup_file "modules/$module" else - echo "gnulib-tool: module $module doesn't exist" 1>&2 + func_warning "module $module doesn't exist" module= fi } @@ -1341,12 +1384,21 @@ func_verify_tests_module () esac } +# Suffix of a sed expression that extracts a particular field from a +# module description. +# A field starts with a line that contains a keyword, such as 'Description', +# followed by a colon and optional whitespace. All following lines, up to +# the next field (or end of file if there is none) form the contents of the +# field. +# An absent field is equivalent to a field with empty contents. +# NOTE: Keep this in sync with sed_extract_cache_prog below! sed_extract_prog=':[ ]*$/ { :a n s/^Description:[ ]*$// s/^Status:[ ]*$// s/^Notice:[ ]*$// + s/^Applicability:[ ]*$// s/^Files:[ ]*$// s/^Depends-on:[ ]*$// s/^configure\.ac-early:[ ]*$// @@ -1362,40 +1414,409 @@ sed_extract_prog=':[ ]*$/ { :b }' +# Piece of a sed expression that converts a field header line to a shell +# variable name, +# NOTE: Keep this in sync with sed_extract_prog above! +sed_extract_field_header=' + s/^Description:[ ]*$/description/ + s/^Status:[ ]*$/status/ + s/^Notice:[ ]*$/notice/ + s/^Applicability:[ ]*$/applicability/ + s/^Files:[ ]*$/files/ + s/^Depends-on:[ ]*$/dependson/ + s/^configure\.ac-early:[ ]*$/configureac_early/ + s/^configure\.ac:[ ]*$/configureac/ + s/^Makefile\.am:[ ]*$/makefile/ + s/^Include:[ ]*$/include/ + s/^Link:[ ]*$/link/ + s/^License:[ ]*$/license/ + s/^Maintainer:[ ]*$/maintainer/' + +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. + declare -A modcache_cached + sed_to_declare_statement='s|^.*/\([a-zA-Z0-9_]*\)/$|declare -A modcache_\1|p' + declare_script=`echo "$sed_extract_field_header" | sed -n -e "$sed_to_declare_statement"` + eval "$declare_script" + + else + + # func_cache_var module + # computes the cache variable name corresponding to $module. + # Note: This computation can map different module names to the same + # cachevar (such as 'foo-bar', 'foo_bar', or 'foo/bar'); the caller has + # to protect against this case. + # Output: + # - cachevar a shell variable name + if (f=foo; eval echo '${f//o/e}') < /dev/null 2>/dev/null | grep fee >/dev/null; then + # Bash 2.0 and newer, ksh, and zsh support the syntax + # ${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 () + { + cachevar=c_${1//[!a-zA-Z0-9_]/_} + } + else + func_cache_var () + { + case $1 in + *[!a-zA-Z0-9_]*) + cachevar=c_`echo "$1" | LC_ALL=C sed -e 's/[^a-zA-Z0-9_]/_/g'` ;; + *) + cachevar=c_$1 ;; + esac + } + fi + + fi + + # func_init_sed_convert_to_cache_statements + # Input: + # - modcachevar_assignment + # Output: + # - sed_convert_to_cache_statements + func_init_sed_convert_to_cache_statements () + { + # 'sed' script that turns a module description into shell script + # assignments, suitable to be eval'ed. All active characters are escaped. + # This script turns + # Description: + # Some module's description + # + # Files: + # lib/file.h + # into: + # modcache_description[$1]=\ + # 'Some module'"'"'s description + # ' + # modcache_files[$1]=\ + # 'lib/file.h' + # or: + # c_MODULE_description_set=set; c_MODULE_description=\ + # 'Some module'"'"'s description + # ' + # c_MODULE_files_set=set; c_MODULE_files=\ + # 'lib/file.h' + # The script consists of two parts: + # 1) Ignore the lines before the first field header. + # 2) A loop, treating non-field-header lines by escaping single quotes + # and adding a closing quote in the last line, + sed_convert_to_cache_statements=" + :llla + # Here we have not yet seen a field header. + + # See if the current line contains a field header. + t llla1 + :llla1 + ${sed_extract_field_header} + t lllb + + # No field header. Ignore the line. + + # Read the next line. Upon EOF, just exit. + n + b llla + + :lllb + # The current line contains a field header. + + # Turn it into the beginning of an assignment. + s/^\\(.*\\)\$/${modcachevar_assignment}\\\\/ + + # Move it to the hold space. Don't print it yet, + # because we want no assignment if the field is empty. + h + + # Read the next line. + # Upon EOF, the field was empty. Print no assignment. Just exit. + n + + # See if the current line contains a field header. + t lllb1 + :lllb1 + ${sed_extract_field_header} + # If it is, the previous field was empty. Print no assignment. + t lllb + + # Not a field header. + + # Print the previous line, held in the hold space. + x + p + x + + # Transform single quotes. + s/'/'\"'\"'/g + + # Prepend a single quote. + s/^/'/ + + :lllc + + # Move it to the hold space. + h + + # Read the next line. + # Upon EOF, branch. + \${ + b llle + } + n + + # See if the current line contains a field header. + t lllc1 + :lllc1 + ${sed_extract_field_header} + t llld + + # Print the previous line, held in the hold space. + x + p + x + + # Transform single quotes. + s/'/'\"'\"'/g + + b lllc + + :llld + # A field header. + # Print the previous line, held in the hold space, with a single quote + # to end the assignment. + x + s/\$/'/ + p + x + + b lllb + + :llle + # EOF seen. + # Print the previous line, held in the hold space, with a single quote + # to end the assignment. + x + s/\$/'/ + p + # Exit. + n + " + if ! $sed_comments; then + # Remove comments. + sed_convert_to_cache_statements=`echo "$sed_convert_to_cache_statements" \ + | sed -e 's/^ *//' -e 's/^#.*//'` + fi + } + + if $have_associative; then + # sed_convert_to_cache_statements does not depend on the module. + modcachevar_assignment='modcache_\1[$1]=' + func_init_sed_convert_to_cache_statements + fi + + # func_cache_lookup_module module + # + # looks up a module, like 'func_lookup_file modules/$module', and stores all + # of its relevant data in a cache in the memory of the processing shell. If + # already cached, it does not look it up again, thus saving file access time. + # Parameters: + # - module non-empty string + # Output if $have_associative: + # - modcache_cached[$module] set to yes + # - modcache_description[$module] == + # - modcache_status[$module] \ set to the field's value, minus the + # - ... / final newline, + # - modcache_maintainer[$module] == or unset if the field's value is empty + # Output if ! $have_associative: + # - cachevar a shell variable name + # - ${cachevar}_cached set to $module + # - ${cachevar}_description == + # - ${cachevar}_status \ set to the field's value, minus the + # - ... / final newline, + # - ${cachevar}_maintainer == or unset if the field's value is empty + # - ${cachevar}_description_set == + # - ${cachevar}_status_set \ set to non-empty if the field's value + # - ... / is non-empty, + # - ${cachevar}_maintainer_set == or unset if the field's value is empty + func_cache_lookup_module () + { + if $have_associative; then + cached=${modcache_cached[$1]} + else + func_cache_var "$1" + eval "cached=\"\$${cachevar}_cached\"" + fi + if test -z "$cached"; 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 + else + eval "${cachevar}_cached=\"\$1\"" + fi + if ! $have_associative; then + # sed_convert_to_cache_statements depends on the module. + modcachevar_assignment="${cachevar}"'_\1_set=set; '"${cachevar}"'_\1=' + func_init_sed_convert_to_cache_statements + fi + cache_statements=`LC_ALL=C sed -n -e "$sed_convert_to_cache_statements" < "$lookedup_file"` + eval "$cache_statements" + else + if ! $have_associative; then + if test "$1" != "$cached"; then + func_fatal_error "cache variable collision between $1 and $cached" + fi + fi + fi + } + +fi + # func_get_description module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_description () { - func_lookup_file "modules/$1" - sed -n -e "/^Description$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Description$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_description[$1]+set}"; then + echo "${modcache_description[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_description_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_description\"" + echo "${field_value}" + fi + fi + fi } # func_get_status module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_status () { - func_lookup_file "modules/$1" - sed -n -e "/^Status$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Status$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_status[$1]+set}"; then + echo "${modcache_status[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_status_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_status\"" + echo "${field_value}" + fi + fi + fi } # func_get_notice module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_notice () { - func_lookup_file "modules/$1" - sed -n -e "/^Notice$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Notice$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_notice[$1]+set}"; then + echo "${modcache_notice[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_notice_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_notice\"" + echo "${field_value}" + fi + fi + fi +} + +# func_get_applicability module +# Input: +# - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules +# The expected result (on stdout) is either 'main', or 'tests', or 'all'. +func_get_applicability () +{ + if ! $modcache; then + func_lookup_file "modules/$1" + my_applicability=`sed -n -e "/^Applicability$sed_extract_prog" < "$lookedup_file"` + else + func_cache_lookup_module "$1" + # Get the field's value, without the final newline. + if $have_associative; then + my_applicability="${modcache_applicability[$1]}" + else + eval "my_applicability=\"\$${cachevar}_applicability\"" + fi + fi + if test -n "$my_applicability"; then + echo $my_applicability + else + # The default is 'main' or 'tests', depending on the module's name. + case $1 in + *-tests) echo "tests";; + *) echo "main";; + esac + fi } # func_get_filelist module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_filelist () { - func_lookup_file "modules/$1" - sed -n -e "/^Files$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Files$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_files[$1]+set}"; then + echo "${modcache_files[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_files_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_files\"" + echo "${field_value}" + fi + fi + fi echo m4/00gnulib.m4 echo m4/gnulib-common.m4 case "$autoconf_minversion" in @@ -1410,6 +1831,7 @@ func_get_filelist () # elements starting with prefix and ending with suffix are considered. # Processing: removed_prefix and removed_suffix are removed from each element, # added_prefix and added_suffix are added to each element. +# prefix, suffix should not contain shell-special characters. # removed_prefix, removed_suffix should not contain the characters "$`\{}[]^|. # added_prefix, added_suffix should not contain the characters \|&. func_filter_filelist () @@ -1421,8 +1843,10 @@ func_filter_filelist () }; then ffflist= for fff in $3; do + # Do not quote possibly-empty parameters in case patterns, + # AIX and HP-UX ksh won't match them if they are empty. case "$fff" in - "$4"*"$5") + $4*$5) if test -n "$6"; then func_remove_prefix fff "$6" fi @@ -1442,7 +1866,7 @@ func_filter_filelist () sed_fff_filter="s|^$6\(.*\)$7\$|$8\\1$9|" ffflist=`for fff in $3; do case "$fff" in - "$4"*"$5") echo "$fff" ;; + $4*$5) echo "$fff" ;; esac done | sed -e "$sed_fff_filter"` fi @@ -1452,6 +1876,7 @@ func_filter_filelist () # func_get_dependencies module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_dependencies () { # ${module}-tests always implicitly depends on ${module}. @@ -1463,35 +1888,102 @@ func_get_dependencies () ;; esac # Then the explicit dependencies listed in the module description. - func_lookup_file "modules/$1" - sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file" + 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 + else + eval "field_set=\"\$${cachevar}_dependson_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_dependson\"" + echo "${field_value}" + fi + fi + fi } # func_get_autoconf_early_snippet module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_autoconf_early_snippet () { - func_lookup_file "modules/$1" - sed -n -e "/^configure\.ac-early$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^configure\.ac-early$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_configureac_early[$1]+set}"; then + echo "${modcache_configureac_early[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_configureac_early_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_configureac_early\"" + echo "${field_value}" + fi + fi + fi } # func_get_autoconf_snippet module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_autoconf_snippet () { - func_lookup_file "modules/$1" - sed -n -e "/^configure\.ac$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^configure\.ac$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_configureac[$1]+set}"; then + echo "${modcache_configureac[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_configureac_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_configureac\"" + echo "${field_value}" + fi + fi + fi } # 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_lookup_file "modules/$1" - sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Makefile\.am$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_makefile[$1]+set}"; then + echo "${modcache_makefile[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_makefile_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_makefile\"" + echo "${field_value}" + fi + fi + fi case "$1" in *-tests) # *-tests module live in tests/, not lib/. @@ -1515,7 +2007,22 @@ func_get_automake_snippet () }' sed_extract_mentioned_files='s/^lib_SOURCES[ ]*+=[ ]*//p' already_mentioned_files=` \ - sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" \ + { if ! $modcache; then + sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" + else + if $have_associative; then + if test -n "${modcache_makefile[$1]+set}"; then + echo "${modcache_makefile[$1]}" + fi + else + eval 'field_set="$'"${cachevar}"'_makefile_set"' + if test -n "$field_set"; then + eval 'field_value="$'"${cachevar}"'_makefile"' + echo "${field_value}" + fi + fi + fi + } \ | sed -e "$sed_combine_lines" \ | sed -n -e "$sed_extract_mentioned_files" | sed -e 's/#.*//'` all_files=`func_get_filelist $1` @@ -1571,29 +2078,82 @@ func_get_automake_snippet () # func_get_include_directive module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_include_directive () { - func_lookup_file "modules/$1" - sed -n -e "/^Include$sed_extract_prog" < "$lookedup_file" | \ - sed -e 's/^\(["<]\)/#include \1/' + { + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Include$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_include[$1]+set}"; then + echo "${modcache_include[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_include_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_include\"" + echo "${field_value}" + fi + fi + fi + } | sed -e 's/^\(["<]\)/#include \1/' } # func_get_link_directive module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_link_directive () { - func_lookup_file "modules/$1" - sed -n -e "/^Link$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Link$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_link[$1]+set}"; then + echo "${modcache_link[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_link_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_link\"" + 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 () { - 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 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 + fi + fi # The default is GPL. echo "GPL" } | sed -e 's,^ *$,,' | sed -e 1q @@ -1602,10 +2162,27 @@ func_get_license () # func_get_maintainer module # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules func_get_maintainer () { - func_lookup_file "modules/$1" - sed -n -e "/^Maintainer$sed_extract_prog" < "$lookedup_file" + if ! $modcache; then + func_lookup_file "modules/$1" + sed -n -e "/^Maintainer$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_maintainer[$1]+set}"; then + echo "${modcache_maintainer[$1]}" + fi + else + eval "field_set=\"\$${cachevar}_maintainer_set\"" + if test -n "$field_set"; then + eval "field_value=\"\$${cachevar}_maintainer\"" + echo "${field_value}" + fi + fi + fi } # func_get_tests_module module @@ -1638,6 +2215,7 @@ func_acceptable () # 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 # - incobsolete true if obsolete modules among dependencies should be @@ -1668,7 +2246,7 @@ func_modules_transitive_closure () # 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 - echo "warning: module $module has duplicated dependencies: "`echo $duplicated_deps` 1>&2 + func_warning "module $module has duplicated dependencies: "`echo $duplicated_deps` fi for dep in $deps; do if test -n "$incobsolete" \ @@ -1697,6 +2275,7 @@ func_modules_transitive_closure () # 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: # - modules list of modules, including 'dummy' if needed @@ -1738,6 +2317,7 @@ ba # func_modules_notice # Input: # - 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 # - modules list of modules, including dependencies func_modules_notice () @@ -1759,6 +2339,7 @@ func_modules_notice () # func_modules_to_filelist # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - modules list of modules, including dependencies # Output: # - files list of files @@ -1827,6 +2408,7 @@ func_dest_tmpfilename () # Input: # - destdir target directory # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - f the original file name # - lookedup_file name of the merged (combined) file # - lookedup_tmp true if it is located in the tmp directory, blank otherwise @@ -1860,6 +2442,7 @@ func_add_file () # Input: # - destdir target directory # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - f the original file name # - lookedup_file name of the merged (combined) file # - lookedup_tmp true if it is located in the tmp directory, blank otherwise @@ -1906,6 +2489,7 @@ func_update_file () # emits the contents of library makefile to standard output. # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - modules list of modules, including dependencies # - libname library name # - pobase directory relative to destdir where to place *.po files @@ -1953,7 +2537,14 @@ func_emit_lib_Makefile_am () echo "## Process this file with automake to produce Makefile.in." func_emit_copyright_notice if test -n "$actioncmd"; then - echo "# Reproduce by: $actioncmd" + # The maximum line length (excluding the terminating newline) of any file + # that is to be preprocessed by config.status is 3070. config.status uses + # awk, and the HP-UX 11.00 awk fails if a line has length >= 3071; + # similarly, the IRIX 6.5 awk fails if a line has length >= 3072. + len=`echo "$actioncmd" | wc -c` + if test -n "$len" && test "$len" -le 3000; then + echo "# Reproduce by: $actioncmd" + fi fi echo uses_subdirs= @@ -1974,16 +2565,16 @@ func_emit_lib_Makefile_am () echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@" echo "${libname}_${libext}_DEPENDENCIES += @${perhapsLT}ALLOCA@" fi - } > amsnippet.tmp + } > "$tmp"/amsnippet # Skip the contents if it's entirely empty. - if grep '[^ ]' amsnippet.tmp > /dev/null ; then + if grep '[^ ]' "$tmp"/amsnippet > /dev/null ; then echo "## begin gnulib module $module" echo - cat amsnippet.tmp + cat "$tmp"/amsnippet echo "## end gnulib module $module" echo fi - rm -f amsnippet.tmp + rm -f "$tmp"/amsnippet # Test whether there are some source files in subdirectories. for f in `func_get_filelist "$module"`; do case $f in @@ -1995,7 +2586,7 @@ func_emit_lib_Makefile_am () done fi done - } > allsnippets.tmp + } > "$tmp"/allsnippets if test -z "$makefile_name"; then # If there are source files in subdirectories, prevent collision of the # object files (example: hash.c and libxml/hash.c). @@ -2013,7 +2604,7 @@ func_emit_lib_Makefile_am () 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. - if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then + if grep '^pkgdata_DATA *+=' "$tmp"/allsnippets > /dev/null; then echo "pkgdata_DATA =" fi echo "EXTRA_DIST =" @@ -2047,9 +2638,14 @@ func_emit_lib_Makefile_am () echo "AM_CFLAGS =" fi echo - if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then - # One of the snippets already specifies an installation location for the - # library. Don't confuse automake by saying it should not be installed. + if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$tmp"/allsnippets > /dev/null \ + || { test -n "$makefile_name" \ + && test -f "$sourcebase/Makefile.am" \ + && LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$sourcebase/Makefile.am" > /dev/null; \ + }; then + # One of the snippets or the user's Makefile.am already specifies an + # installation location for the library. Don't confuse automake by saying + # it should not be installed. : else # By default, the generated library should not be installed. @@ -2070,7 +2666,7 @@ func_emit_lib_Makefile_am () echo "AM_CPPFLAGS += -DDEFAULT_TEXT_DOMAIN=\\\"${po_domain}-gnulib\\\"" echo fi - cat allsnippets.tmp \ + cat "$tmp"/allsnippets \ | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' echo echo "mostlyclean-local: mostlyclean-generic" @@ -2080,13 +2676,14 @@ func_emit_lib_Makefile_am () echo " fi; \\" echo " done; \\" echo " :" - rm -f allsnippets.tmp + rm -f "$tmp"/allsnippets } # func_emit_po_Makevars # emits the contents of po/ makefile parameterization to standard output. # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - sourcebase directory relative to destdir where to place source code # - pobase directory relative to destdir where to place *.po files # - po_domain prefix of i18n domain to use (without -gnulib suffix) @@ -2148,6 +2745,7 @@ EOF # emits the file list to be passed to xgettext to standard output. # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - sourcebase directory relative to destdir where to place source code # - files list of new files func_emit_po_POTFILES_in () @@ -2163,6 +2761,7 @@ func_emit_po_POTFILES_in () # emits the contents of tests makefile to standard output. # Input: # - local_gnulib_dir from --local-dir +# - modcache true or false, from --cache-modules/--no-cache-modules # - modules list of modules, including dependencies # - libname library name # - auxdir directory relative to destdir where to place build aux files @@ -2204,7 +2803,7 @@ func_emit_tests_Makefile_am () func_emit_copyright_notice echo uses_subdirs= - ( + { for module in $modules; do if $for_test; then func_verify_tests_module @@ -2225,16 +2824,16 @@ func_emit_tests_Makefile_am () echo "libtests_a_LIBADD += @${perhapsLT}ALLOCA@" echo "libtests_a_DEPENDENCIES += @${perhapsLT}ALLOCA@" fi - } > amsnippet.tmp + } > "$tmp"/amsnippet # Skip the contents if it's entirely empty. - if grep '[^ ]' amsnippet.tmp > /dev/null ; then + if grep '[^ ]' "$tmp"/amsnippet > /dev/null ; then echo "## begin gnulib module $module" echo - cat amsnippet.tmp + cat "$tmp"/amsnippet echo "## end gnulib module $module" echo fi - rm -f amsnippet.tmp + rm -f "$tmp"/amsnippet # Test whether there are some source files in subdirectories. for f in `func_get_filelist "$module"`; do case $f in @@ -2246,7 +2845,7 @@ func_emit_tests_Makefile_am () done fi done - ) > allsnippets.tmp + } > "$tmp"/allsnippets # 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). @@ -2265,6 +2864,7 @@ func_emit_tests_Makefile_am () # "AM_GNU_GETTEXT used but SUBDIRS not defined" echo "SUBDIRS =" echo "TESTS =" + echo "XFAIL_TESTS =" echo "TESTS_ENVIRONMENT =" echo "noinst_PROGRAMS =" if ! $for_test; then @@ -2281,7 +2881,7 @@ func_emit_tests_Makefile_am () fi # Automake versions < 1.9b create an empty pkgdatadir at installation time # if you specify pkgdata_DATA to empty. This is a workaround. - if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then + if grep '^pkgdata_DATA *+=' "$tmp"/allsnippets > /dev/null; then echo "pkgdata_DATA =" fi echo "EXTRA_DIST =" @@ -2339,7 +2939,12 @@ func_emit_tests_Makefile_am () echo "AM_LIBTOOLFLAGS = --preserve-dup-deps" echo fi - cat allsnippets.tmp \ + # Many test scripts use ${EXEEXT} or ${srcdir}. + # EXEEXT is defined by AC_PROG_CC through autoconf. + # srcdir is defined by autoconf and automake. + echo "TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='\$(srcdir)'" + echo + cat "$tmp"/allsnippets \ | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' echo "# Clean up after Solaris cc." echo "clean-local:" @@ -2352,7 +2957,7 @@ func_emit_tests_Makefile_am () echo " fi; \\" echo " done; \\" echo " :" - rm -f allsnippets.tmp + rm -f "$tmp"/allsnippets } # func_emit_initmacro_start macro_prefix @@ -2420,7 +3025,7 @@ func_emit_initmacro_end () echo " if test -n \"\$${macro_prefix_arg}_LIBOBJS\"; then" echo " # Remove the extension." echo " sed_drop_objext='s/\\.o\$//;s/\\.obj\$//'" - echo " for i in \`for i in \$${macro_prefix_arg}_LIBOBJS; do echo \"\$i\"; done | sed \"\$sed_drop_objext\" | sort | uniq\`; do" + echo " for i in \`for i in \$${macro_prefix_arg}_LIBOBJS; do echo \"\$i\"; done | sed -e \"\$sed_drop_objext\" | sort | uniq\`; do" echo " ${macro_prefix_arg}_libobjs=\"\$${macro_prefix_arg}_libobjs \$i.\$ac_objext\"" echo " ${macro_prefix_arg}_ltlibobjs=\"\$${macro_prefix_arg}_ltlibobjs \$i.lo\"" echo " done" @@ -2471,6 +3076,7 @@ func_emit_initmacro_done () # Uses also the variables # - 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 # - sourcebase directory relative to destdir where to place source code @@ -2731,9 +3337,10 @@ func_import () # ignoring tests modules. Its lib/* sources go into $sourcebase/. If --lgpl # is specified, it will consist only of LGPLed source. # The tests-related module list is the transitive closure of the specified - # modules, including tests modules, minus the main module list. Its lib/* - # sources (brought in through dependencies of *-tests modules) go into - # $testsbase/. It may contain GPLed source, even if --lgpl is specified. + # 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="" @@ -2747,7 +3354,13 @@ func_import () fi # Determine tests-related module list. echo "$final_modules" | LC_ALL=C sort -u > "$tmp"/final-modules - testsrelated_modules=`func_reset_sigpipe; echo "$main_modules" | LC_ALL=C sort -u | LC_ALL=C join -v 2 - "$tmp"/final-modules` + testsrelated_modules=`func_reset_sigpipe + 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/^/ /' @@ -2795,7 +3408,7 @@ func_import () case "$lgpl" in yes | 3) case $license in - LGPL | LGPLv2+) ;; + LGPL | LGPLv2+ | LGPLv3+) ;; *) func_append license_incompatibilities "$module $license$nl" ;; esac ;; @@ -2857,11 +3470,22 @@ s,^\(.................................................[^ ]*\) *, sed_transform_main_lib_file=$sed_transform_main_lib_file' s/GNU Lesser General/GNU General/g s/GNU Library General/GNU General/g - s/version \(2\|2\.1\)\([ ,]\)/version 3\2/g + s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g ' fi fi + # Determine script to apply to auxiliary files that go into $auxdir/. + sed_transform_build_aux_file= + if test -n "$do_copyrights"; then + # Update license. + sed_transform_build_aux_file=$sed_transform_build_aux_file' + s/GNU Lesser General/GNU General/g + s/GNU Library General/GNU General/g + s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g + ' + fi + # Determine script to apply to library files that go into $testsbase/. sed_transform_testsrelated_lib_file="$sed_transform_lib_file" if test -n "$do_copyrights"; then @@ -2869,7 +3493,7 @@ s,^\(.................................................[^ ]*\) *, sed_transform_testsrelated_lib_file=$sed_transform_testsrelated_lib_file' s/GNU Lesser General/GNU General/g s/GNU Library General/GNU General/g - s/version \(2\|2\.1\)\([ ,]\)/version 3\2/g + s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g ' fi @@ -2905,22 +3529,25 @@ s,^\(.................................................[^ ]*\) *, func_append old_files " m4/gnulib-tool.m4" fi + rewritten='%REWRITTEN%' sed_rewrite_old_files="\ - s,^build-aux/,$auxdir/, - s,^doc/,$cached_docbase/, - s,^lib/,$cached_sourcebase/, - s,^m4/,$cached_m4base/, - s,^tests/,$cached_testsbase/, - s,^tests=lib/,$cached_testsbase/, - s,^top/,," + s,^build-aux/,$rewritten$auxdir/, + s,^doc/,$rewritten$cached_docbase/, + s,^lib/,$rewritten$cached_sourcebase/, + s,^m4/,$rewritten$cached_m4base/, + s,^tests/,$rewritten$cached_testsbase/, + s,^tests=lib/,$rewritten$cached_testsbase/, + s,^top/,$rewritten, + s,^$rewritten,," sed_rewrite_new_files="\ - s,^build-aux/,$auxdir/, - s,^doc/,$docbase/, - s,^lib/,$sourcebase/, - s,^m4/,$m4base/, - s,^tests/,$testsbase/, - s,^tests=lib/,$testsbase/, - s,^top/,," + s,^build-aux/,$rewritten$auxdir/, + s,^doc/,$rewritten$docbase/, + s,^lib/,$rewritten$sourcebase/, + s,^m4/,$rewritten$m4base/, + s,^tests/,$rewritten$testsbase/, + s,^tests=lib/,$rewritten$testsbase/, + s,^top/,$rewritten, + s,^$rewritten,," # Create directories. { echo "$sourcebase" @@ -3010,6 +3637,14 @@ s,^\(.................................................[^ ]*\) *, ;; esac fi + if test -n "$sed_transform_build_aux_file"; then + case "$of" in + build-aux/*) + sed -e "$sed_transform_build_aux_file" \ + < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" + ;; + esac + fi if test -n "$sed_transform_testsrelated_lib_file"; then case "$of" in tests=lib/*) @@ -3362,7 +3997,7 @@ s,//*$,/,' esac echo "gl_LOCAL_DIR([$relative_local_gnulib_dir])" echo "gl_MODULES([" - echo "$specified_modules" | sed 's/^/ /g' + echo "$specified_modules" | sed -e 's/^/ /g' echo "])" test -z "$incobsolete" || echo "gl_WITH_OBSOLETE" echo "gl_AVOID([$avoidlist])" @@ -3487,7 +4122,7 @@ s,//*$,/,' -e "$sed_replace_build_aux" if test "$module" = 'alloca' && test "$libtool" = true; then echo 'changequote(,)dnl' - echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' + echo 'LTALLOCA=`echo "$ALLOCA" | sed -e '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' echo 'changequote([, ])dnl' echo 'AC_SUBST([LTALLOCA])' fi @@ -3776,6 +4411,7 @@ s,//*$,/,' # func_create_testdir testdir modules # Input: # - 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 func_create_testdir () { @@ -3784,10 +4420,9 @@ func_create_testdir () if test -z "$modules"; then # All modules together. # Except config-h, which breaks all modules which use HAVE_CONFIG_H. - # Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME. # Except ftruncate, mountlist, which abort the configuration on mingw. FIXME. modules=`func_all_modules` - modules=`for m in $modules; do case $m in config-h | fnmatch-posix | ftruncate | mountlist) ;; *) echo $m;; esac; done` + modules=`for m in $modules; do case $m in config-h | ftruncate | mountlist) ;; *) echo $m;; esac; done` fi modules=`for m in $modules; do echo $m; done | LC_ALL=C sort -u` @@ -3818,19 +4453,19 @@ func_create_testdir () GPLv2+) case "$license" in GPLv2+ | LGPLv2+) ;; - *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; LGPL) case "$license" in LGPL | LGPLv2+) ;; - *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; LGPLv2+) case "$license" in LGPLv2+) ;; - *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; esac ;; esac @@ -3872,13 +4507,15 @@ func_create_testdir () echo "$files" | sed -e 's/^/ /' fi + rewritten='%REWRITTEN%' sed_rewrite_files="\ - s,^build-aux/,$auxdir/, - s,^doc/,$docbase/, - s,^lib/,$sourcebase/, - s,^m4/,$m4base/, - s,^tests/,$testsbase/, - s,^top/,," + s,^build-aux/,$rewritten$auxdir/, + s,^doc/,$rewritten$docbase/, + s,^lib/,$rewritten$sourcebase/, + s,^m4/,$rewritten$m4base/, + s,^tests/,$rewritten$testsbase/, + s,^top/,$rewritten, + s,^$rewritten,," # Create directories. for f in $files; do echo $f; done \ @@ -3963,7 +4600,7 @@ func_create_testdir () test -d "$testdir/$testsbase" || mkdir "$testdir/$testsbase" # Viewed from the $testsbase subdirectory, $auxdir is different. saved_auxdir="$auxdir" - auxdir=`echo "$testsbase/"|sed 's%[^/][^/]*//*%../%g'`"$auxdir" + auxdir=`echo "$testsbase/" | sed -e 's%[^/][^/]*//*%../%g'`"$auxdir" # Create $testsbase/Makefile.am. use_libtests=false destfile="$testsbase/Makefile.am" @@ -3975,13 +4612,17 @@ func_create_testdir () echo "AC_CONFIG_AUX_DIR([$auxdir])" echo "AM_INIT_AUTOMAKE" echo - echo "AM_CONFIG_HEADER([config.h])" + 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" + echo + fi for module in $modules; do func_verify_module if test -n "$module"; then @@ -4065,7 +4706,8 @@ func_create_testdir () # by "merging" config.h into $testsbase/config.h; look out for gcc warnings. echo "AH_TOP([#include \"../config.h\"])" echo - echo "AC_OUTPUT([Makefile])" + echo "AC_CONFIG_FILES([Makefile])" + echo "AC_OUTPUT" ) > "$testdir/$testsbase/configure.ac" auxdir="$saved_auxdir" func_append subdirs " $testsbase" @@ -4090,7 +4732,7 @@ func_create_testdir () fi echo "AM_INIT_AUTOMAKE" echo - echo "AM_CONFIG_HEADER([config.h])" + echo "AC_CONFIG_HEADERS([config.h])" echo echo "AC_PROG_CC" echo "AC_PROG_INSTALL" @@ -4181,7 +4823,8 @@ func_create_testdir () *) func_append makefiles " $d/Makefile" ;; esac done - echo "AC_OUTPUT([$makefiles])" + echo "AC_CONFIG_FILES([$makefiles])" + echo "AC_OUTPUT" ) > "$testdir/configure.ac" # Create autogenerated files. @@ -4259,6 +4902,7 @@ func_create_testdir () # func_create_megatestdir megatestdir allmodules # Input: # - 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 func_create_megatestdir () { @@ -4276,8 +4920,7 @@ func_create_megatestdir () done # Then, all modules all together. # Except config-h, which breaks all modules which use HAVE_CONFIG_H. - # Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME. - allmodules=`for m in $allmodules; do if test $m != config-h && test $m != fnmatch-posix; then echo $m; fi; done` + allmodules=`for m in $allmodules; do if test $m != config-h; then echo $m; fi; done` func_create_testdir "$megatestdir/ALL" "$allmodules" func_append megasubdirs "ALL" @@ -4344,7 +4987,8 @@ func_create_megatestdir () echo "AC_PROG_MAKE_SET" echo echo "AC_CONFIG_SUBDIRS([$megasubdirs])" - echo "AC_OUTPUT([Makefile])" + echo "AC_CONFIG_FILES([Makefile])" + echo "AC_OUTPUT" ) > "$megatestdir/configure.ac" # Create autogenerated files. @@ -4367,6 +5011,39 @@ case $mode in func_all_modules ;; + find ) + # sed expression that converts a literal to a basic regular expression. + # Needs to handle . [ \ * ^ $. + sed_literal_to_basic_regex='s/\\/\\\\/g +s/\[/\\[/g +s/\^/\\^/g +s/\([.*$]\)/[\1]/g' + for filename + do + if test -f "$gnulib_dir/$filename" \ + || { test -n "$local_gnulib_dir" && test -f "$local_gnulib_dir/$filename"; }; then + filenameregex='^'`echo "$filename" | sed -e "$sed_literal_to_basic_regex"`'$' + module_candidates=` + { + (cd "$gnulib_dir" && find modules -type f -print | xargs -n 100 grep -l "$filenameregex" /dev/null | sed -e 's,^modules/,,') + if test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules"; then + (cd "$local_gnulib_dir" && find modules -type f -print | sed -e 's,^modules/,,' -e 's,\.diff$,,') + fi + } \ + | func_sanitize_modulelist \ + | LC_ALL=C sort -u + ` + for module in $module_candidates; do + if func_get_filelist $module | grep "$filenameregex" > /dev/null; then + echo $module + fi + done + else + func_warning "file $filename does not exist" + fi + done + ;; + import | update ) # Where to import. @@ -4383,7 +5060,7 @@ case $mode in if test -f "$destdir"/configure.in; then configure_ac="$destdir/configure.in" else - func_fatal_error "cannot find $destdir/configure.ac" + func_fatal_error "cannot find $destdir/configure.ac - make sure you run gnulib-tool from within your package's directory" fi fi @@ -4427,7 +5104,7 @@ case $mode in m4dirs= m4dirs_count=0 if test -f "$destdir"/Makefile.am; then - aclocal_amflags=`sed -n 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/p' "$destdir"/Makefile.am` + 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 @@ -4457,7 +5134,7 @@ case $mode in sedexpr2='s,^[^/]*$,.,' sedexpr3='s,/[^/]*$,,' m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort -u` - m4dirs_count=`echo "$m4dirs" | wc -l` + m4dirs_count=`printf %s "$m4dirs" | wc -l` fi fi if test $m4dirs_count = 0; then @@ -4595,6 +5272,16 @@ case $mode in done ;; + extract-applicability ) + for module + do + func_verify_module + if test -n "$module"; then + func_get_applicability "$module" + fi + done + ;; + extract-filelist ) for module do @@ -4705,13 +5392,15 @@ case $mode in test -n "$docbase" || docbase="doc" test -n "$testsbase" || testsbase="tests" test -n "$auxdir" || auxdir="build-aux" + rewritten='%REWRITTEN%' sed_rewrite_files="\ - s,^build-aux/,$auxdir/, - s,^doc/,$docbase/, - s,^lib/,$sourcebase/, - s,^m4/,$m4base/, - s,^tests/,$testsbase/, - s,^top/,," + s,^build-aux/,$rewritten$auxdir/, + s,^doc/,$rewritten$docbase/, + s,^lib/,$rewritten$sourcebase/, + s,^m4/,$rewritten$m4base/, + s,^tests/,$rewritten$testsbase/, + s,^top/,$rewritten, + s,^$rewritten,," if test -d "$dest"; then destdir="$dest" g=`echo "$f" | sed -e "$sed_rewrite_files"`