X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=c9029ca0b29e9c93276632de1e14304a83499b2b;hb=3f4d4d8853c9f26c9597aa021defa6b0b1861aa4;hp=232802d4426702bfb9d2cc50e086c042dd103b68;hpb=96a6bfb77c6f0a88f5bd12616281ff83e744eee5;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index 232802d44..c9029ca0b 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2002-2006 Free Software Foundation, Inc. +# Copyright (C) 2002-2007 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 @@ -22,9 +22,12 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2006-09-18 12:54:13 $' +cvsdatestamp='$Date: 2007-07-13 01:17:00 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` +nl=' +' +IFS=" "" $nl" # You can set AUTOCONFPATH to empty if autoconf 2.57 is already in your PATH. AUTOCONFPATH= @@ -38,11 +41,17 @@ AUTOCONFPATH= # You can set AUTOMAKEPATH to empty if automake 1.9.x is already in your PATH. AUTOMAKEPATH= +# You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH. +GETTEXTPATH= + # If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the -# variables AUTOCONF, ACLOCAL, AUTOMAKE, AUTORECONF individually. +# variables AUTOCONF, AUTOHEADER, ACLOCAL, AUTOMAKE, AUTORECONF individually. if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then AUTOCONF="${AUTOCONFPATH}autoconf" fi +if test -z "${AUTOHEADER}" || test -n "${AUTOCONFPATH}"; then + AUTOHEADER="${AUTOCONFPATH}autoheader" +fi if test -z "${ACLOCAL}" || test -n "${AUTOMAKEPATH}"; then ACLOCAL="${AUTOMAKEPATH}aclocal" fi @@ -53,10 +62,18 @@ if test -z "${AUTORECONF}" || test -n "${AUTOCONFPATH}"; then AUTORECONF="${AUTOCONFPATH}autoreconf" fi -# GNU sort is needed. Set SORT to its location (not needed if it's called -# 'sort' and already in the PATH). -if test -z "$SORT"; then - SORT=sort +# If you didn't set GETTEXTPATH, you can also set the variable AUTOPOINT. +if test -z "${AUTOPOINT}" || test -n "${GETTEXTPATH}"; then + AUTOPOINT="${GETTEXTPATH}autopoint" +fi + +# When using GNU sed, turn off as many GNU extensions as possible, +# to minimize the risk of accidentally using non-portable features. +# However, do this only for gnulib-tool itself, not for the code that +# gnulib-tool generates, since we don't want "sed --posix" to leak +# into makefiles. +if (alias) > /dev/null 2>&1 && echo | sed --posix -e d >/dev/null 2>&1; then + alias sed='sed --posix' fi # func_usage @@ -67,7 +84,7 @@ func_usage () Usage: gnulib-tool --list gnulib-tool --import [module1 ... moduleN] gnulib-tool --update - gnulib-tool --create-testdir --dir=directory module1 ... moduleN + gnulib-tool --create-testdir --dir=directory [module1 ... moduleN] gnulib-tool --create-megatestdir --dir=directory [module1 ... moduleN] gnulib-tool --test --dir=directory module1 ... moduleN gnulib-tool --megatest --dir=directory [module1 ... moduleN] @@ -77,6 +94,7 @@ Usage: gnulib-tool --list gnulib-tool --extract-autoconf-snippet module gnulib-tool --extract-automake-snippet module gnulib-tool --extract-include-directive module + gnulib-tool --extract-link-directive module gnulib-tool --extract-license module gnulib-tool --extract-maintainer module gnulib-tool --extract-tests-module module @@ -101,6 +119,7 @@ Operation modes: --extract-autoconf-snippet extract the snippet for configure.ac --extract-automake-snippet extract the snippet for library makefile --extract-include-directive extract the #include directive + --extract-link-directive extract the linker directive --extract-license report the license terms of the source files under lib/ --extract-maintainer report the maintainer(s) inside gnulib @@ -146,6 +165,8 @@ Options for --import: Options for --import and --update: --dry-run For --import, only print what would have been done. -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. Report bugs to ." } @@ -155,18 +176,19 @@ Report bugs to ." func_version () { year=`echo "$last_checkin_date" | sed -e 's,/.*$,,'` - echo "$progname (GNU $package) $version" - echo "Copyright (C) $year Free Software Foundation, Inc. + echo "\ +$progname (GNU $package) $version +Copyright (C) $year Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - echo "Written by" "Bruno Haible" "and" "Simon Josefsson" +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +Written by" "Bruno Haible" "and" "Simon Josefsson" } # func_emit_copyright_notice # outputs to stdout a header for a generated file. func_emit_copyright_notice () { - echo "# Copyright (C) 2004-2006 Free Software Foundation, Inc." + echo "# Copyright (C) 2004-2007 Free Software Foundation, Inc." 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" @@ -177,6 +199,13 @@ func_emit_copyright_notice () echo "# Generated by gnulib-tool." } +# func_exit STATUS +# exit with status +func_exit () +{ + (exit $1); exit $1 +} + # func_tmpdir # creates a temporary directory. # Sets variable @@ -204,17 +233,33 @@ func_tmpdir () } || { echo "$0: cannot create a temporary directory in $TMPDIR" >&2 - { (exit 1); exit 1; } + func_exit 1 } } +# func_append var value +# appends the given value to the shell variable var. +if ( foo=bar; foo+=baz && test "$foo" = barbaz ) >/dev/null 2>&1; then + # Use bash's += operator. It reduces complexity of appending repeatedly to + # a single variable from O(n^2) to O(n). + func_append () + { + eval "$1+=\"\$2\"" + } +else + func_append () + { + eval "$1=\"\$$1\$2\"" + } +fi + # func_fatal_error message # outputs to stderr a fatal error message, and terminates the program. func_fatal_error () { echo "gnulib-tool: *** $1" 1>&2 echo "gnulib-tool: *** Stop." 1>&2 - exit 1 + func_exit 1 } # func_readlink SYMLINK @@ -234,21 +279,6 @@ else } fi -# func_ln_if_changed SRC DEST -# Like ln -s, but avoids munging timestamps if the link is correct. -func_ln_if_changed () -{ - if test $# -ne 2; then - echo "usage: func_ln_if_changed SRC DEST" >&2 - fi - if test -L "$2" && test "$1" = "`func_readlink "$2"`"; then - : - else - rm -f "$2" - ln -s "$1" "$2" - fi -} - # func_relativize DIR1 DIR2 # computes a relative pathname RELDIR such that DIR1/RELDIR = DIR2. # Input: @@ -342,6 +372,191 @@ func_relconcat () done } +# func_ln SRC DEST +# Like ln -s, except that SRC is given relative to the current directory (or +# absolute), not given relative to the directory of DEST. +func_ln () +{ + case "$1" in + /*) + ln -s "$1" "$2" ;; + *) # SRC is relative. + case "$2" in + /*) + ln -s "`pwd`/$1" "$2" ;; + *) # DEST is relative too. + ln_destdir=`echo "$2" | sed -e 's,[^/]*$,,'` + test -n "$ln_destdir" || ln_destdir="." + func_relativize "$ln_destdir" "$1" + ln -s "$reldir" "$2" + ;; + esac + ;; + esac +} + +# func_ln_if_changed SRC DEST +# Like func_ln, but avoids munging timestamps if the link is correct. +func_ln_if_changed () +{ + if test $# -ne 2; then + echo "usage: func_ln_if_changed SRC DEST" >&2 + fi + ln_target=`func_readlink "$2"` + if test -L "$2" && test "$1" = "$ln_target"; then + : + else + rm -f "$2" + func_ln "$1" "$2" + fi +} + +# Ensure an 'echo' command that does not interpret backslashes. +# Test cases: +# echo '\n' | wc -l prints 1 when OK, 2 when KO +# echo '\t' | grep t > /dev/null has return code 0 when OK, 1 when KO +# This problem is a weird heritage from SVR4. BSD got it right (except that +# BSD echo interprets '-n' as an option, which is also not desirable). +# Nowadays the problem occurs in 4 situations: +# - in bash, when the shell option xpg_echo is set (bash >= 2.04) +# or when it was built with --enable-usg-echo-default (bash >= 2.0) +# or when it was built with DEFAULT_ECHO_TO_USG (bash < 2.0), +# - in zsh, when sh-emulation is not set, +# - in ksh (e.g. AIX /bin/sh and Solaris /usr/xpg4/bin/sh are ksh instances, +# and HP-UX /bin/sh and IRIX /bin/sh behave similarly), +# - in Solaris /bin/sh and OSF/1 /bin/sh. +# We try the following workarounds: +# - for all: respawn using $CONFIG_SHELL if that is set and works. +# - for bash >= 2.04: unset the shell option xpg_echo. +# - for bash >= 2.0: define echo to a function that uses the printf built-in. +# - for bash < 2.0: define echo to a function that uses cat of a here document. +# - for zsh: turn sh-emulation on. +# - for ksh: alias echo to 'print -r'. +# - for ksh: alias echo to a function that uses cat of a here document. +# - for Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh and rely on +# the ksh workaround. +# - otherwise: respawn using /bin/sh and rely on the workarounds. +# When respawning, we pass --no-reexec as first argument, so as to avoid +# turning this script into a fork bomb in unlucky situations. +have_echo= +if echo '\t' | grep t > /dev/null; then + have_echo=yes # Lucky! +fi +# Try the workarounds. +# Respawn using $CONFIG_SHELL if that is set and works. +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 + exec $CONFIG_SHELL "$0" --no-reexec "$@" + exit 127 +fi +# For bash >= 2.04: unset the shell option xpg_echo. +if test -z "$have_echo" \ + && test -n "$BASH_VERSION" \ + && (shopt -o xpg_echo; echo '\t' | grep t > /dev/null) 2>/dev/null; then + shopt -o xpg_echo + have_echo=yes +fi +# For bash >= 2.0: define echo to a function that uses the printf built-in. +# For bash < 2.0: define echo to a function that uses cat of a here document. +# (There is no win in using 'printf' over 'cat' if it is not a shell built-in.) +if test -z "$have_echo" \ + && test -n "$BASH_VERSION"; then \ + if type printf 2>/dev/null | grep / > /dev/null; then + # 'printf' is not a shell built-in. +echo () +{ +cat < /dev/null; then + have_echo=yes + fi +fi +# For zsh: turn sh-emulation on. +if test -z "$have_echo" \ + && test -n "$ZSH_VERSION" \ + && (emulate sh) >/dev/null 2>&1; then + emulate sh +fi +# For ksh: alias echo to 'print -r'. +if test -z "$have_echo" \ + && (type print) >/dev/null 2>&1; then + # A 'print' command exists. + if type print 2>/dev/null | grep / > /dev/null; then + : + else + # 'print' is a shell built-in. + if (print -r '\told' | grep told > /dev/null) 2>/dev/null; then + # 'print' is the ksh shell built-in. + alias echo='print -r' + fi + fi +fi +if test -z "$have_echo" \ + && echo '\t' | grep t > /dev/null; then + have_echo=yes +fi +# For ksh: alias echo to a function that uses cat of a here document. +# The ksh manual page says: +# "Aliasing is performed when scripts are read, not while they are executed. +# Therefore, for an alias to take effect, the alias definition command has +# to be executed before the command which references the alias is read." +# Because of this, we have to play strange tricks with have_echo, to ensure +# that the top-level statement containing the test starts after the 'alias' +# command. +if test -z "$have_echo"; then +bsd_echo () +{ +cat </dev/null +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 +fi +# For Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh. +if test -z "$have_echo" \ + && test "X$1" != "X--no-reexec" \ + && test -f /bin/ksh; then + exec /bin/ksh "$0" --no-reexec "$@" + exit 127 +fi +# Otherwise: respawn using /bin/sh. +if test -z "$have_echo" \ + && test "X$1" != "X--no-reexec" \ + && test -f /bin/sh; then + exec /bin/sh "$0" --no-reexec "$@" + exit 127 +fi +if test -z "$have_echo"; then + func_fatal_error "Shell does not support 'echo' correctly. Please install GNU bash and set the environment variable CONFIG_SHELL to point to it." +fi +if echo '\t' | grep t > /dev/null; then + : # Works fine now. +else + func_fatal_error "Shell does not support 'echo' correctly. Workaround does not work. Please report this as a bug to bug-gnulib@gnu.org." +fi +if test "X$1" = "X--no-reexec"; then + shift +fi + # Command-line option processing. # Removes the OPTIONS from the arguments. Sets the variables: # - mode list or import or create-testdir or create-megatestdir @@ -363,7 +578,8 @@ func_relconcat () # - 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 --symbolic was given, blank otherwise +# - symbolic true if --symlink was given, blank otherwise +# - lsymbolic true if --local-symlink was given, blank otherwise { mode= destdir= @@ -384,6 +600,7 @@ func_relconcat () do_changelog=: doit=: symbolic= + lsymbolic= supplied_opts="$@" @@ -503,10 +720,11 @@ func_relconcat () if test $# = 0; then func_fatal_error "missing argument for --avoid" fi - avoidlist="$avoidlist $1" + func_append avoidlist " $1" shift ;; --avoid=* ) - avoidlist="$avoidlist "`echo "X$1" | sed -e 's/^X--avoid=//'` + arg=`echo "X$1" | sed -e 's/^X--avoid=//'` + func_append avoidlist " $arg" shift ;; --lgpl ) lgpl=true @@ -546,12 +764,15 @@ func_relconcat () -s | --symbolic | --symboli | --symbol | --symbo | --symb | --symlink | --symlin | --symli | --syml | --sym | --sy ) symbolic=true shift ;; + --local-symlink | --local-symlin | --local-symli | --local-syml | --local-sym | --local-sy | --local-s ) + lsymbolic=true + shift ;; --help | --hel | --he | --h ) func_usage - exit 0 ;; + func_exit $? ;; --version | --versio | --versi | --vers | --ver | --ve | --v ) func_version - exit 0 ;; + func_exit $? ;; -- ) # Stop option processing shift @@ -559,7 +780,7 @@ func_relconcat () -* ) echo "gnulib-tool: unknown option $1" 1>&2 echo "Try 'gnulib-tool --help' for more information." 1>&2 - exit 1 ;; + func_exit 1 ;; * ) break ;; esac @@ -571,7 +792,7 @@ func_relconcat () 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 - exit 1 + func_exit 1 fi if test -n "$local_gnulib_dir" || test -n "$supplied_libname" \ || test -n "$sourcebase" || test -n "$m4base" \ @@ -582,7 +803,7 @@ func_relconcat () 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 - exit 1 + func_exit 1 fi do_changelog=false fi @@ -621,11 +842,14 @@ func_relconcat () s,^dnl .*$,, s, dnl .*$,, /AC_PREREQ/ { - s,^.*AC_PREREQ([[ ]*\([^])]*\).*$,prereqs="$prereqs \1",p + s,^.*AC_PREREQ([[ ]*\([^])]*\).*$,\1,p }' - eval `sed -n -e "$my_sed_traces" < "$configure_ac"` + prereqs=`sed -n -e "$my_sed_traces" < "$configure_ac"` if test -n "$prereqs"; then - autoconf_minversion=`for version in $prereqs; do echo $version; done | $SORT -g -u | tail -1` + autoconf_minversion=` + for version in $prereqs; do echo $version; done | + LC_ALL=C sort -nru | sed 1q + ` fi fi if test -z "$autoconf_minversion"; then @@ -640,7 +864,7 @@ func_relconcat () # m4base (to avoid an error in func_import) and optional for the others. sed_trimtrailingslashes='s,\([^/]\)//*$,\1,' case "$local_gnulib_dir" in - */ ) sourcebase=`echo "$local_gnulib_dir" | sed -e "$sed_trimtrailingslashes"` ;; + */ ) local_gnulib_dir=`echo "$local_gnulib_dir" | sed -e "$sed_trimtrailingslashes"` ;; esac case "$sourcebase" in */ ) sourcebase=`echo "$sourcebase" | sed -e "$sed_trimtrailingslashes"` ;; @@ -662,16 +886,62 @@ func_relconcat () case "$0" in /*) self_abspathname="$0" ;; */*) self_abspathname=`pwd`/"$0" ;; - *) for d in `echo ":$PATH:" | sed -e 's/:::*/:.:/g' | sed -e 's/:/ /g'`; do - if test -x "$d/$0" && test ! -d "$d/$0"; then - self_abspathname="$d/$0" - break - fi - done - if test -z "$self_abspathname"; then - func_fatal_error "could not locate the gnulib-tool program - how did you invoke it?" - fi - ;; + *) + # Look in $PATH. + # Iterate through the elements of $PATH. + # We use IFS=: instead of + # for d in `echo ":$PATH:" | sed -e 's/:::*/:.:/g' | sed -e 's/:/ /g'` + # because the latter does not work when some PATH element contains spaces. + # We use a canonicalized $pathx instead of $PATH, because empty PATH + # elements are by definition equivalent to '.', however field splitting + # according to IFS=: loses empty fields in many shells: + # - /bin/sh on OSF/1 and Solaris loses all empty fields (at the + # beginning, at the end, and in the middle), + # - /bin/sh on IRIX and /bin/ksh on IRIX and OSF/1 lose empty fields + # at the beginning and at the end, + # - GNU bash, /bin/sh on AIX and HP-UX, and /bin/ksh on AIX, HP-UX, + # Solaris lose empty fields at the end. + # The 'case' statement is an optimization, to avoid evaluating the + # explicit canonicalization command when $PATH contains no empty fields. + self_abspathname= + if test "${PATH_SEPARATOR+set}" != set; then + func_tmpdir + { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh + chmod +x "$tmp"/conf.sh + if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -rf "$tmp" + fi + if test "$PATH_SEPARATOR" = ";"; then + # On Windows, programs are searched in "." before $PATH. + pathx=".;$PATH" + else + # On Unix, we have to convert empty PATH elements to ".". + pathx="$PATH" + case :$PATH: in + *::*) + pathx=`echo ":$PATH:" | sed -e 's/:::*/:.:/g' -e 's/^://' -e 's/:\$//'` + ;; + esac + fi + save_IFS="$IFS" + IFS="$PATH_SEPARATOR" + for d in $pathx; do + IFS="$save_IFS" + test -z "$d" && d=. + if test -x "$d/$0" && test ! -d "$d/$0"; then + self_abspathname="$d/$0" + break + fi + done + IFS="$save_IFS" + if test -z "$self_abspathname"; then + func_fatal_error "could not locate the gnulib-tool program - how did you invoke it?" + fi + ;; esac while test -h "$self_abspathname"; do # Resolve symbolic link. @@ -685,7 +955,16 @@ done gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` func_tmpdir -trap 'rm -rf "$tmp"' 0 1 2 3 15 +trap 'exit_status=$? + if test "$signal" != 0; then + echo "caught signal $signal" >&2 + fi + rm -rf "$tmp" + exit $exit_status' 0 +for signal in 1 2 3 13 15; do + trap '{ signal='$signal'; func_exit 1; }' $signal +done +signal=0 # func_lookup_file file # looks up a file in $local_gnulib_dir or $gnulib_dir, or combines it through @@ -730,12 +1009,20 @@ func_all_modules () # Filter out unit test modules; they can be retrieved through # --extract-tests-module if desired. { - (cd "$gnulib_dir/modules" && ls -1) + (cd "$gnulib_dir" && find modules -type f -print | sed -e 's,^modules/,,') if test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules"; then - (cd "$local_gnulib_dir/modules" && ls -1 | sed -e 's,\.diff$,,') + (cd "$local_gnulib_dir" && find modules -type f -print | sed -e 's,^modules/,,' -e 's,\.diff$,,') fi } \ - | sed -e '/^CVS$/d' -e '/^ChangeLog$/d' -e '/^COPYING$/d' -e '/^README$/d' -e '/^TEMPLATE$/d' -e '/^TEMPLATE-TESTS$/d' -e '/~$/d' \ + | 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' \ | sed -e '/-tests$/d' \ | LC_ALL=C sort -u } @@ -755,6 +1042,7 @@ func_verify_module () && test "COPYING" != "$module" \ && test "README" != "$module" \ && test "TEMPLATE" != "$module" \ + && test "TEMPLATE-EXTENDED" != "$module" \ && test "TEMPLATE-TESTS" != "$module"; then # OK, $module is a correct module name. # Verify that building the module description with 'patch' succeeds. @@ -797,9 +1085,11 @@ sed_extract_prog=':[ ]*$/ { s/^Description:[ ]*$// s/^Files:[ ]*$// s/^Depends-on:[ ]*$// + s/^configure\.ac-early:[ ]*$// s/^configure\.ac:[ ]*$// s/^Makefile\.am:[ ]*$// s/^Include:[ ]*$// + s/^Link:[ ]*$// s/^License:[ ]*$// s/^Maintainer:[ ]*$// tb @@ -824,6 +1114,7 @@ func_get_filelist () { func_lookup_file "modules/$1" sed -n -e "/^Files$sed_extract_prog" < "$lookedup_file" + echo m4/gnulib-common.m4 case "$autoconf_minversion" in 2.59) #echo m4/onceonly.m4 @@ -844,6 +1135,15 @@ func_get_dependencies () sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file" } +# func_get_autoconf_early_snippet module +# Input: +# - local_gnulib_dir from --local-dir +func_get_autoconf_early_snippet () +{ + func_lookup_file "modules/$1" + sed -n -e "/^configure\.ac-early$sed_extract_prog" < "$lookedup_file" +} + # func_get_autoconf_snippet module # Input: # - local_gnulib_dir from --local-dir @@ -860,6 +1160,62 @@ func_get_automake_snippet () { func_lookup_file "modules/$1" sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" + case "$1" in + *-tests) + # *-tests module live in tests/, not lib/. + ;; + *) + # Synthesize an EXTRA_DIST augmentation. + sed_combine_lines='/\\$/{ + :a + N + s/\\\n/ / + s/\\$/\\/ + ta + }' + sed_extract_mentioned_files='s/^lib_SOURCES[ ]*+=[ ]*//p' + already_mentioned_files=` \ + sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" \ + | sed -e "$sed_combine_lines" \ + | sed -n -e "$sed_extract_mentioned_files" | sed -e 's/#.*//'` + all_files=`func_get_filelist $1` + lib_files=`for f in $all_files; do \ + case $f in \ + lib/*) echo $f ;; \ + esac; \ + done | sed -e 's,^lib/,,'` + # Remove $already_mentioned_files from $lib_files. + echo "$lib_files" | LC_ALL=C sort -u > "$tmp"/lib-files + extra_files=`for f in $already_mentioned_files; do echo $f; done \ + | LC_ALL=C sort -u | LC_ALL=C join -v 2 - "$tmp"/lib-files` + if test -n "$extra_files"; then + echo "EXTRA_DIST +=" $extra_files + echo + fi + # Synthesize also an EXTRA_lib_SOURCES augmentation. + # This is necessary so that automake can generate the right list of + # dependency rules. + # A possible approach would be to use autom4te --trace of the redefined + # AC_LIBOBJ and AC_REPLACE_FUNCS macros when creating the Makefile.am + # (use autom4te --trace, not just grep, so that AC_LIBOBJ invocations + # inside autoconf's built-in macros are not missed). + # But it's simpler and more robust to do it here, based on the file list. + # If some .c file exists and is not used with AC_LIBOBJ - for example, + # a .c file is preprocessed into another .c file for BUILT_SOURCES -, + # automake will generate a useless dependency; this is harmless. + case "$1" in + relocatable-prog-wrapper) ;; + *) + sed_extract_c_files='/\.c$/p' + extra_files=`echo "$extra_files" | sed -n -e "$sed_extract_c_files"` + if test -n "$extra_files"; then + echo "EXTRA_lib_SOURCES +=" $extra_files + echo + fi + ;; + esac + ;; + esac } # func_get_include_directive module @@ -872,13 +1228,25 @@ func_get_include_directive () sed -e 's/^\(["<]\)/#include \1/' } +# func_get_link_directive module +# Input: +# - local_gnulib_dir from --local-dir +func_get_link_directive () +{ + func_lookup_file "modules/$1" + sed -n -e "/^Link$sed_extract_prog" < "$lookedup_file" +} + # func_get_license module # Input: # - local_gnulib_dir from --local-dir func_get_license () { func_lookup_file "modules/$1" - sed -n -e "/^License$sed_extract_prog" < "$lookedup_file" + { sed -n -e "/^License$sed_extract_prog" < "$lookedup_file" + # The default is GPL. + echo "GPL" + } | sed -e 's,^ *$,,' | sed -e 1q } # func_get_maintainer module @@ -923,49 +1291,50 @@ func_acceptable () # - modules list of specified modules # - inctests true if tests should be included, blank otherwise # - avoidlist list of modules to avoid +# - tmp pathname of a temporary directory # Output: # - modules list of modules, including dependencies func_modules_transitive_closure () { - while true; do - xmodules= - for module in $modules; do + # 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 + # list has been processed, it is added to the "handled list", so we can avoid + # to process it again. + handledmodules= + inmodules="$modules" + outmodules= + while test -n "$inmodules"; do + inmodules_this_round="$inmodules" + inmodules= # Accumulator, queue for next round + for module in $inmodules_this_round; do func_verify_module if test -n "$module"; then - # Duplicate dependencies are harmless, but Jim wants a warning. - duplicated_deps=`func_get_dependencies $module | 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 - fi if func_acceptable $module; then - xmodules="$xmodules $module" - for depmodule in `func_get_dependencies $module`; do - if func_acceptable $depmodule; then - xmodules="$xmodules $depmodule" - fi - done + func_append outmodules " $module" + deps=`func_get_dependencies $module` + # 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 + fi + func_append inmodules " $deps" if test -n "$inctests"; then testsmodule=`func_get_tests_module $module` if test -n "$testsmodule"; then - if func_acceptable $testsmodule; then - xmodules="$xmodules $testsmodule" - for depmodule in `func_get_dependencies $testsmodule`; do - if func_acceptable $depmodule; then - xmodules="$xmodules $depmodule" - fi - done - fi + func_append inmodules " $testsmodule" fi fi fi fi done - xmodules=`for m in $xmodules; do echo $m; done | LC_ALL=C sort | LC_ALL=C uniq` - if test "$xmodules" = "$modules"; then - break - fi - modules="$xmodules" + handledmodules=`for m in $handledmodules $inmodules_this_round; do echo $m; done | LC_ALL=C sort -u` + # 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` done + modules=`for m in $outmodules; do echo $m; done | LC_ALL=C sort -u` + rm -f "$tmp"/queued-modules } # func_modules_add_dummy @@ -999,7 +1368,9 @@ ba done # Add the dummy module, to make sure the library will be non-empty. if test -z "$have_lib_SOURCES"; then - modules="$modules dummy" + if func_acceptable "dummy"; then + func_append modules " dummy" + fi fi } @@ -1015,7 +1386,8 @@ func_modules_to_filelist () for module in $modules; do func_verify_module if test -n "$module"; then - files="$files "`func_get_filelist $module` + fs=`func_get_filelist $module` + func_append files " $fs" fi done files=`for f in $files; do echo $f; done | LC_ALL=C sort -u` @@ -1027,9 +1399,14 @@ func_modules_to_filelist () # - local_gnulib_dir from --local-dir # - modules list of modules, including dependencies # - libname library name +# - auxdir directory relative to destdir where to place build aux files # - makefile_name from --makefile-name # - libtool true if libtool will be used, false or blank otherwise +# - macro_prefix prefix of gl_LIBOBJS macros to use # - actioncmd (optional) command that will reproduce this invocation +# - for_test true if creating a package for testing, false otherwise +# Output: +# - uses_subdirs nonempty if object files in subdirs exist func_emit_lib_Makefile_am () { # When creating an includable Makefile.am snippet, augment variables with @@ -1046,33 +1423,41 @@ func_emit_lib_Makefile_am () else libext=a perhapsLT= - sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' + sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' fi + if $for_test; then + # When creating a package for testing: Attempt to provoke failures, + # especially link errors, already during "make" rather than during + # "make check", because "make check" is not possible in a cross-compiling + # situation. Turn check_PROGRAMS into noinst_PROGRAMS. + sed_transform_check_PROGRAMS='s,check_PROGRAMS,noinst_PROGRAMS,g' + else + sed_transform_check_PROGRAMS= + fi + echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" echo "## Process this file with automake to produce Makefile.in." func_emit_copyright_notice if test -n "$actioncmd"; then echo "# Reproduce by: $actioncmd" fi echo - if test -z "$makefile_name"; then - # No need to generate dependencies since the sources are in gnulib, not here. - echo "AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies" - fi - echo - ( + uses_subdirs= + { for module in $modules; do func_verify_nontests_module if test -n "$module"; then { func_get_automake_snippet "$module" | sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \ - -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' | - sed -e "$sed_eliminate_LDFLAGS" | - sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' | - sed -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ - -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' + -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \ + -e "$sed_eliminate_LDFLAGS" \ + -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \ + -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ + -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \ + -e "$sed_transform_check_PROGRAMS" if test "$module" = 'alloca'; then echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@" + echo "${libname}_${libext}_DEPENDENCIES += @${perhapsLT}ALLOCA@" fi } > amsnippet.tmp # Skip the contents if its entirely empty. @@ -1084,27 +1469,29 @@ func_emit_lib_Makefile_am () echo fi rm -f amsnippet.tmp + # Test whether there are some source files in subdirectories. + for f in `func_get_filelist "$module"`; do + case $f in + lib/*/*.c) uses_subdirs=yes ;; + esac + done fi done - ) > allsnippets.tmp - if grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *= *$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. - : - else - # By default, the generated library should not be installed. - echo "noinst_${perhapsLT}LIBRARIES $assign $libname.$libext" + } > allsnippets.tmp + 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). + subdir_options= + if test -n "$uses_subdirs"; then + subdir_options=' subdir-objects' + fi + echo "AUTOMAKE_OPTIONS = 1.5 gnits${subdir_options}" fi echo - echo "${libname}_${libext}_SOURCES =" - # Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However, - # automake during its analyses looks for $(LIBOBJS), not for @LIBOBJS@. - echo "${libname}_${libext}_LIBADD = \$(${perhapsLT}LIBOBJS)" - if test "$libtool" = true; then - echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)" - fi if test -z "$makefile_name"; then 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. if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then @@ -1124,15 +1511,35 @@ func_emit_lib_Makefile_am () echo "AM_CPPFLAGS =" fi echo - cat allsnippets.tmp + if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *= *$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. + : + else + # By default, the generated library should not be installed. + echo "noinst_${perhapsLT}LIBRARIES += $libname.$libext" + fi + echo + echo "${libname}_${libext}_SOURCES =" + # Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However, + # automake during its analyses looks for $(LIBOBJS), not for @LIBOBJS@. + echo "${libname}_${libext}_LIBADD = \$(${macro_prefix}_${perhapsLT}LIBOBJS)" + echo "${libname}_${libext}_DEPENDENCIES = \$(${macro_prefix}_${perhapsLT}LIBOBJS)" + echo "EXTRA_${libname}_${libext}_SOURCES =" + if test "$libtool" = true; then + echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)" + fi + echo + cat allsnippets.tmp \ + | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' echo echo "mostlyclean-local: mostlyclean-generic" - echo " @test -z \"\$(MOSTLYCLEANDIRS)\" || \\" - echo " for dir in \$(MOSTLYCLEANDIRS); do \\" - echo " if test -d \$\$dir; then \\" - echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" - echo " fi; \\" - echo " done" + echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\" + echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\" + echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" + echo " fi; \\" + echo " done; \\" + echo " :" rm -f allsnippets.tmp } @@ -1147,6 +1554,7 @@ func_emit_lib_Makefile_am () # - sourcebase relative directory containing lib source code # - m4base relative directory containing autoconf macros # - testsbase relative directory containing unit test code +# - for_test true if creating a package for testing, false otherwise func_emit_tests_Makefile_am () { if test "$libtool" = true; then @@ -1159,9 +1567,19 @@ func_emit_tests_Makefile_am () sed_eliminate_LDFLAGS= else libext=a - sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' + sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' + fi + if $for_test; then + # When creating a package for testing: Attempt to provoke failures, + # especially link errors, already during "make" rather than during + # "make check", because "make check" is not possible in a cross-compiling + # situation. Turn check_PROGRAMS into noinst_PROGRAMS. + sed_transform_check_PROGRAMS='s,check_PROGRAMS,noinst_PROGRAMS,g' + else + sed_transform_check_PROGRAMS= fi testsbase_inverse=`echo "$testsbase" | sed -e 's,/$,,' | sed -e 's,[^/][^/]*,..,g'` + echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" echo "## Process this file with automake to produce Makefile.in." func_emit_copyright_notice echo @@ -1177,11 +1595,12 @@ func_emit_tests_Makefile_am () { func_get_automake_snippet "$module" | sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \ - -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' | - sed -e "$sed_eliminate_LDFLAGS" | - sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' | - sed -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ - -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' + -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \ + -e "$sed_eliminate_LDFLAGS" \ + -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \ + -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ + -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \ + -e "$sed_transform_check_PROGRAMS" } > amsnippet.tmp # Skip the contents if its entirely empty. if grep '[^ ]' amsnippet.tmp > /dev/null ; then @@ -1202,7 +1621,9 @@ func_emit_tests_Makefile_am () echo "TESTS =" echo "TESTS_ENVIRONMENT =" echo "noinst_PROGRAMS =" - echo "check_PROGRAMS =" + if ! $for_test; then + echo "check_PROGRAMS =" + fi echo "noinst_HEADERS =" if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then echo "pkgdata_DATA =" @@ -1229,15 +1650,84 @@ func_emit_tests_Makefile_am () echo " rm -rf SunWS_cache" echo echo "mostlyclean-local: mostlyclean-generic" - echo " @test -z \"\$(MOSTLYCLEANDIRS)\" || \\" - echo " for dir in \$(MOSTLYCLEANDIRS); do \\" - echo " if test -d \$\$dir; then \\" - echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" - echo " fi; \\" - echo " done" + echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\" + echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\" + echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" + echo " fi; \\" + echo " done; \\" + echo " :" rm -f allsnippets.tmp } +# func_emit_initmacro_start +# emits the first few statements of the gl_INIT macro to standard output. +# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use +func_emit_initmacro_start () +{ + # Overriding AC_LIBOBJ and AC_REPLACE_FUNCS has the effect of storing + # platform-dependent object files in ${macro_prefix}_LIBOBJS instead of + # LIBOBJS. The purpose is to allow several gnulib instantiations under + # a single configure.ac file. (AC_CONFIG_LIBOBJ_DIR does not allow this + # flexibility.) + # Furthermore it avoids an automake error like this when a Makefile.am + # that uses pieces of gnulib also uses $(LIBOBJ): + # automatically discovered file `error.c' should not be explicitly mentioned + echo " m4_pushdef([AC_LIBOBJ], m4_defn([${macro_prefix}_LIBOBJ]))" + echo " m4_pushdef([AC_REPLACE_FUNCS], m4_defn([${macro_prefix}_REPLACE_FUNCS]))" + # Overriding AC_LIBSOURCES has the same purpose of avoiding the automake + # error when a Makefile.am that uses pieces of gnulib also uses $(LIBOBJ): + # automatically discovered file `error.c' should not be explicitly mentioned + # We let automake know about the files to be distributed through the + # EXTRA_lib_SOURCES variable. + echo " m4_pushdef([AC_LIBSOURCES], m4_defn([${macro_prefix}_LIBSOURCES]))" +} + +# func_emit_initmacro_end +# emits the last few statements of the gl_INIT macro to standard output. +# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use +func_emit_initmacro_end () +{ + echo " m4_popdef([AC_LIBSOURCES])" + echo " m4_popdef([AC_REPLACE_FUNCS])" + echo " m4_popdef([AC_LIBOBJ])" + echo " AC_CONFIG_COMMANDS_PRE([" + echo " ${macro_prefix}_libobjs=" + echo " ${macro_prefix}_ltlibobjs=" + echo " if test -n \"\$${macro_prefix}_LIBOBJS\"; then" + echo " # Remove the extension." + echo " sed_drop_objext='s/\\.o\$//;s/\\.obj\$//'" + echo " for i in \`for i in \$${macro_prefix}_LIBOBJS; do echo \"\$i\"; done | sed \"\$sed_drop_objext\" | sort | uniq\`; do" + echo " ${macro_prefix}_libobjs=\"\$${macro_prefix}_libobjs \$i.\$ac_objext\"" + echo " ${macro_prefix}_ltlibobjs=\"\$${macro_prefix}_ltlibobjs \$i.lo\"" + echo " done" + echo " fi" + echo " AC_SUBST([${macro_prefix}_LIBOBJS], [\$${macro_prefix}_libobjs])" + echo " AC_SUBST([${macro_prefix}_LTLIBOBJS], [\$${macro_prefix}_ltlibobjs])" + echo " ])" +} + +# func_emit_initmacro_done +# emits a few statements after the gl_INIT macro to standard output. +# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use +func_emit_initmacro_done () +{ + echo + echo "# Like AC_LIBOBJ, except that the module name goes" + echo "# into ${macro_prefix}_LIBOBJS instead of into LIBOBJS." + echo "AC_DEFUN([${macro_prefix}_LIBOBJ]," + echo " [${macro_prefix}_LIBOBJS=\"\$${macro_prefix}_LIBOBJS \$1.\$ac_objext\"])" + echo + echo "# Like AC_REPLACE_FUNCS, except that the module name goes" + echo "# into ${macro_prefix}_LIBOBJS instead of into LIBOBJS." + echo "AC_DEFUN([${macro_prefix}_REPLACE_FUNCS]," + echo " [AC_CHECK_FUNCS([\$1], , [${macro_prefix}_LIBOBJ(\$ac_func)])])" + echo + echo "# Like AC_LIBSOURCES, except that it does nothing." + echo "# We rely on EXTRA_lib..._SOURCES instead." + echo "AC_DEFUN([${macro_prefix}_LIBSOURCES]," + echo " [])" +} + # func_import modules # Uses also the variables # - destdir target directory @@ -1259,6 +1749,8 @@ func_emit_tests_Makefile_am () # - autoconf_minversion minimum supported autoconf version # - doit : if actions shall be executed, false if only to be printed # - symbolic true if files should be symlinked, copied otherwise +# - lsymbolic true if files from local_gnulib_dir should be symlinked, +# copied otherwise func_import () { # Get the cached settings. @@ -1269,6 +1761,7 @@ func_import () cached_m4base= cached_docbase= cached_testsbase= + cached_inctests= cached_libname= cached_lgpl= cached_makefile_name= @@ -1302,6 +1795,9 @@ func_import () /gl_TESTS_BASE(/ { s,^.*gl_TESTS_BASE([[ ]*\([^])]*\).*$,cached_testsbase="\1",p } + /gl_WITH_TESTS/ { + s,^.*$,cached_inctests=true,p + } /gl_LIB(/ { s,^.*gl_LIB([[ ]*\([^])]*\).*$,cached_libname="\1",p } @@ -1368,8 +1864,10 @@ func_import () specified_modules="$cached_specified_modules $1" # Append the cached and the specified avoidlist. This is probably better # than dropping the cached one when --avoid is specified at least once. - avoidlist=`echo $cached_avoidlist $avoidlist` - # The sourcebase defaults to the cached one. + 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" if test -z "$sourcebase"; then @@ -1390,6 +1888,10 @@ func_import () func_fatal_error "missing --tests-base option" 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" @@ -1438,7 +1940,7 @@ func_import () for module in $modules; do license=`func_get_license $module` case $license in - LGPL | 'GPLed build tool') ;; + LGPL | LGPLv2+ | 'GPLed build tool') ;; 'public domain' | 'unlimited' | 'unmodifiable license text') ;; *) func_fatal_error "incompatible license on module $module: $license" ;; esac @@ -1476,55 +1978,53 @@ func_import () new_files="$files m4/gnulib-tool.m4" old_files="$cached_files" if test -f "$destdir"/$m4base/gnulib-tool.m4; then - old_files="$old_files m4/gnulib-tool.m4" + func_append old_files " m4/gnulib-tool.m4" fi + sed_rewrite_old_files="\ + s,^build-aux/,$auxdir/, + s,^doc/,$cached_docbase/, + s,^lib/,$cached_sourcebase/, + s,^m4/,$cached_m4base/, + s,^tests/,$cached_testsbase/," + sed_rewrite_new_files="\ + s,^build-aux/,$auxdir/, + s,^doc/,$docbase/, + s,^lib/,$sourcebase/, + s,^m4/,$m4base/, + s,^tests/,$testsbase/," + # Create directories. - if test ! -d "$destdir/$sourcebase"; then - if $doit; then - echo "Creating directory $destdir/$sourcebase" - mkdir "$destdir/$sourcebase" || func_fatal_error "failed" - else - echo "Create directory $destdir/$sourcebase" + { echo "$sourcebase" + echo "$m4base" + docfiles=`echo "$files" | sed -n -e 's,^doc/,,p'` + if test -n "$docfiles"; then + echo "$docbase" fi - fi - if test ! -d "$destdir/$m4base"; then - if $doit; then - echo "Creating directory $destdir/$m4base" - mkdir "$destdir/$m4base" || func_fatal_error "failed" - else - echo "Create directory $destdir/$m4base" + if test -n "$inctests"; then + echo "$testsbase" fi - fi - docfiles=`echo "$files" | sed -n -e 's,^doc/,,p'` - if test -n "$docfiles"; then - if test ! -d "$destdir/$docbase"; then - if $doit; then - echo "Creating directory $destdir/$docbase" - mkdir "$destdir/$docbase" || func_fatal_error "failed" - else - echo "Create directory $destdir/$docbase" - fi - fi - fi - if test -n "$inctests"; then - if test ! -d "$destdir/$testsbase"; then - if $doit; then - echo "Creating directory $destdir/$testsbase" - mkdir "$destdir/$testsbase" || func_fatal_error "failed" - else - echo "Create directory $destdir/$testsbase" + echo "$auxdir" + for f in $files; do echo $f; done \ + | sed -e "$sed_rewrite_new_files" \ + | sed -n -e 's,^\(.*\)/[^/]*,\1,p' \ + | LC_ALL=C sort -u + } > "$tmp"/dirs + { # Rearrange file descriptors. Needed because "while ... done < ..." + # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. + exec 5<&0 < "$tmp"/dirs + while read d; do + if test ! -d "$destdir/$d"; then + if $doit; then + echo "Creating directory $destdir/$d" + mkdir -p "$destdir/$d" || func_fatal_error "failed" + else + echo "Create directory $destdir/$d" + fi fi - fi - fi - if test ! -d "$destdir/$auxdir"; then - if $doit; then - echo "Creating directory $destdir/$auxdir" - mkdir "$destdir/$auxdir" || func_fatal_error "failed" - else - echo "Create directory $destdir/$auxdir" - fi - fi + done + exec 0<&5 5<&- + } # func_dest_tmpfilename file # determines the name of a temporary file (file is relative to destdir). @@ -1544,29 +2044,21 @@ func_import () } # Copy files or make symbolic links. Remove obsolete files. + added_files='' + removed_files='' delimiter=' ' - for f in $old_files; do - case "$f" in - build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; - doc/*) g=`echo "$f" | sed -e "s,^doc/,$cached_docbase/,"` ;; - lib/*) g=`echo "$f" | sed -e "s,^lib/,$cached_sourcebase/,"` ;; - m4/*) g=`echo "$f" | sed -e "s,^m4/,$cached_m4base/,"` ;; - tests/*) g=`echo "$f" | sed -e "s,^tests/,$cached_testsbase/,"` ;; - *) g="$f" ;; - esac - echo "$g""$delimiter""$f" - done | LC_ALL=C sort > "$tmp"/old-files - for f in $new_files; do - case "$f" in - build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; - doc/*) g=`echo "$f" | sed -e "s,^doc/,$docbase/,"` ;; - lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; - m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;; - tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;; - *) g="$f" ;; - esac - echo "$g""$delimiter""$f" - done | LC_ALL=C sort > "$tmp"/new-files + # Construct a table with 2 columns: rewritten-file-name original-file-name, + # representing the files according to the last gnulib-tool invocation. + for f in $old_files; do echo $f; done \ + | sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_old_files" \ + | LC_ALL=C sort \ + > "$tmp"/old-files + # Construct a table with 2 columns: rewritten-file-name original-file-name, + # representing the files after this gnulib-tool invocation. + for f in $new_files; do echo $f; done \ + | sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" \ + | LC_ALL=C sort \ + > "$tmp"/new-files # First the files that are in old-files, but not in new-files: sed_take_first_column='s,'"$delimiter"'.*,,' for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_first_column"`; do @@ -1578,10 +2070,14 @@ func_import () else echo "Remove file $g (backup in ${g}~)" fi + func_append removed_files "$g$nl" fi done # func_add_or_update handles a file that ought to be present afterwards. - # Uses parameters f, g, already_present. + # Uses parameters + # - f the original file name + # - g the rewritten file name + # - already_present nonempty if the file already exists, empty otherwise func_add_or_update () { func_dest_tmpfilename "$g" @@ -1608,7 +2104,10 @@ func_import () echo "Replacing file $g (non-gnulib code backuped in ${g}~) !!" fi mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed" - if test -n "$symbolic" && test -z "$lookedup_tmp" \ + if { test -n "$symbolic" \ + || { test -n "$lsymbolic" \ + && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \ + && test -z "$lookedup_tmp" \ && cmp "$lookedup_file" "$tmpfile" > /dev/null; then func_ln_if_changed "$lookedup_file" "$destdir/$g" else @@ -1628,7 +2127,10 @@ func_import () # frequently that developers don't put autogenerated files into CVS. if $doit; then echo "Copying file $g" - if test -n "$symbolic" && test -z "$lookedup_tmp" \ + if { test -n "$symbolic" \ + || { test -n "$lsymbolic" \ + && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \ + && test -z "$lookedup_tmp" \ && cmp "$lookedup_file" "$tmpfile" > /dev/null; then func_ln_if_changed "$lookedup_file" "$destdir/$g" else @@ -1637,64 +2139,68 @@ func_import () else echo "Copy file $g" fi + func_append added_files "$g$nl" fi rm -f "$tmpfile" } # Then the files that are in new-files, but not in old-files: sed_take_last_column='s,^.*'"$delimiter"',,' already_present= - for f in `LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_last_column"`; do - case "$f" in - build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; - doc/*) g=`echo "$f" | sed -e "s,^doc/,$docbase/,"` ;; - lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; - m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;; - tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;; - *) g="$f" ;; - esac - func_add_or_update - done + LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files \ + | sed -e "$sed_take_last_column" \ + | sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" > "$tmp"/added-files + { # Rearrange file descriptors. Needed because "while ... done < ..." + # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. + exec 5<&0 < "$tmp"/added-files + while read g f; do + func_add_or_update + done + exec 0<&5 5<&- + } # Then the files that are in new-files and in old-files: already_present=true - for f in `LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_last_column"`; do - case "$f" in - build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; - doc/*) g=`echo "$f" | sed -e "s,^doc/,$docbase/,"` ;; - lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; - m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;; - tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;; - *) g="$f" ;; - esac - func_add_or_update - done + LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files \ + | sed -e "$sed_take_last_column" \ + | sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" > "$tmp"/kept-files + { # Rearrange file descriptors. Needed because "while ... done < ..." + # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. + exec 5<&0 < "$tmp"/kept-files + while read g f; do + func_add_or_update + done + exec 0<&5 5<&- + } # Command-line invocation printed in a comment in generated gnulib-cache.m4. actioncmd="gnulib-tool --import" - actioncmd="$actioncmd --dir=$destdir" + func_append actioncmd " --dir=$destdir" if test -n "$local_gnulib_dir"; then - actioncmd="$actioncmd --local-dir=$local_gnulib_dir" + func_append actioncmd " --local-dir=$local_gnulib_dir" + fi + func_append actioncmd " --lib=$libname" + func_append actioncmd " --source-base=$sourcebase" + func_append actioncmd " --m4-base=$m4base" + func_append actioncmd " --doc-base=$docbase" + func_append actioncmd " --aux-dir=$auxdir" + if test -n "$inctests"; then + func_append actioncmd " --with-tests" fi - actioncmd="$actioncmd --lib=$libname" - actioncmd="$actioncmd --source-base=$sourcebase" - actioncmd="$actioncmd --m4-base=$m4base" - actioncmd="$actioncmd --doc-base=$docbase" - actioncmd="$actioncmd --aux-dir=$auxdir" for module in $avoidlist; do - actioncmd="$actioncmd --avoid=$module" + func_append actioncmd " --avoid=$module" done if test -n "$lgpl"; then - actioncmd="$actioncmd --lgpl" + func_append actioncmd " --lgpl" fi if test -n "$makefile_name"; then - actioncmd="$actioncmd --makefile_name=$makefile_name" + func_append actioncmd " --makefile-name=$makefile_name" fi if test "$libtool" = true; then - actioncmd="$actioncmd --libtool" + func_append actioncmd " --libtool" else - actioncmd="$actioncmd --no-libtool" + func_append actioncmd " --no-libtool" fi - actioncmd="$actioncmd --macro-prefix=$macro_prefix" - actioncmd="$actioncmd `echo $specified_modules`" + func_append actioncmd " --macro-prefix=$macro_prefix" + func_append actioncmd " `echo $specified_modules`" # Default the makefile name to Makefile.am. if test -n "$makefile_name"; then @@ -1703,6 +2209,9 @@ func_import () makefile_am=Makefile.am fi + # Create normal Makefile.ams. + for_test=false + # Create library makefile. func_dest_tmpfilename $sourcebase/$makefile_am func_emit_lib_Makefile_am > "$tmpfile" @@ -1727,6 +2236,7 @@ func_import () echo "Create $sourcebase/$makefile_am" rm -f "$tmpfile" fi + func_append added_files "$sourcebase/$makefile_am$nl" fi # Create m4/gnulib-cache.m4. @@ -1764,6 +2274,7 @@ func_import () echo "gl_M4_BASE([$m4base])" echo "gl_DOC_BASE([$docbase])" echo "gl_TESTS_BASE([$testsbase])" + test -z "$inctests" || echo "gl_WITH_TESTS" echo "gl_LIB([$libname])" test -z "$lgpl" || echo "gl_LGPL" echo "gl_MAKEFILE_NAME([$makefile_name])" @@ -1804,6 +2315,7 @@ func_import () # Create m4/gnulib-comp.m4. func_dest_tmpfilename $m4base/gnulib-comp.m4 ( + echo "# DO NOT EDIT! GENERATED AUTOMATICALLY!" func_emit_copyright_notice echo "#" echo "# This file represents the compiled summary of the specification in" @@ -1818,23 +2330,30 @@ func_import () echo "AC_DEFUN([${macro_prefix}_EARLY]," echo "[" echo " m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace" - echo " m4_pattern_allow([^gl_ES$])dnl a valid locale name" + 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])" + if test -n "$uses_subdirs"; then + echo " AC_REQUIRE([AM_PROG_CC_C_O])" + fi if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then echo " AC_REQUIRE([AC_GNU_SOURCE])" fi - if grep gl_USE_SYSTEM_EXTENSIONS "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then - echo " AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])" - fi - if grep gl_LOCK "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then - echo " AC_REQUIRE([gl_LOCK_EARLY])" - fi + for module in $modules; do + func_verify_module + if test -n "$module"; then + func_get_autoconf_early_snippet "$module" + fi + done \ + | sed -e '/^$/d;' -e 's/^/ /' echo "])" echo echo "# This macro should be invoked from $configure_ac, in the section" echo "# \"Check for header files, types and library functions\"." echo "AC_DEFUN([${macro_prefix}_INIT]," echo "[" + func_emit_initmacro_start if test "$libtool" = true; then echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" echo " gl_cond_libtool=true" @@ -1844,6 +2363,7 @@ func_import () echo " gl_libdeps=" echo " gl_ltlibdeps=" fi + echo " gl_source_base='$sourcebase'" if test "$auxdir" != "build-aux"; then sed_replace_build_aux=' :a @@ -1851,7 +2371,6 @@ func_import () s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| ba }' - sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'` else sed_replace_build_aux= fi @@ -1873,13 +2392,15 @@ func_import () # _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" | tr 'a-z' 'A-Z'` + libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z-' 'A-Z_'` echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" echo " AC_SUBST([${libname_upper}_LIBDEPS])" echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" fi + func_emit_initmacro_end echo "])" + func_emit_initmacro_done echo echo "# This macro records the list of files which have been installed by" echo "# gnulib-tool and may be removed by future gnulib-tool invocations." @@ -1941,36 +2462,131 @@ func_import () echo "Create $testsbase/$makefile_am" rm -f "$tmpfile" fi + func_append added_files "$testsbase/$makefile_am$nl" fi fi + # Update the .cvsignore and .gitignore files. + { echo "$added_files" | sed -e '/^$/d' -e 's,\([^/]*\)$,|A|\1,' + echo "$removed_files" | sed -e '/^$/d' -e 's,\([^/]*\)$,|R|\1,' + } | LC_ALL=C sort -t'|' -k1,1 > "$tmp"/fileset-changes + { # Rearrange file descriptors. Needed because "while ... done < ..." + # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. + exec 5<&0 < "$tmp"/fileset-changes + func_update_ignorelist () + { + ignore="$1" + if test -f "$destdir/$dir$ignore"; then + if test -n "$dir_added" || test -n "$dir_removed"; then + LC_ALL=C sort "$destdir/$dir$ignore" > "$tmp"/ignore + echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \ + | LC_ALL=C join -v 2 "$tmp"/ignore - > "$tmp"/ignore-added + echo "$dir_removed" | sed -e '/^$/d' | LC_ALL=C sort -u \ + | LC_ALL=C join -v 2 "$tmp"/ignore - > "$tmp"/ignore-removed + if test -s "$tmp"/ignore-added || test -s "$tmp"/ignore-removed; then + if $doit; then + echo "Updating $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)" + mv -f "$destdir/$dir$ignore" "$destdir/$dir$ignore"~ + sed -e 's,^,/^,' -e 's,$,\$/d,' < "$tmp"/ignore-removed > "$tmp"/sed-ignore-removed + cat "$destdir/$dir$ignore"~ "$tmp"/ignore-added \ + | sed -f "$tmp"/sed-ignore-removed \ + > "$destdir/$dir$ignore" + else + echo "Update $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)" + fi + fi + fi + else + if test -n "$dir_added"; then + if $doit; then + echo "Creating $destdir/$dir$ignore" + echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u > "$destdir/$dir$ignore" + else + echo "Create $destdir/$dir$ignore" + fi + fi + fi + } + func_done_dir () + { + dir="$1" + dir_added="$2" + dir_removed="$3" + if test -d "$destdir/${dir}CVS" || test -f "$destdir/${dir}.cvsignore"; then + func_update_ignorelist .cvsignore + fi + if test -d "$destdir/.git" || test -f "$destdir/${dir}.gitignore"; then + func_update_ignorelist .gitignore + fi + } + last_dir= + last_dir_added= + last_dir_removed= + while read line; do + # Why not ''read next_dir op file'' ? Because the dir column can be empty. + next_dir=`echo "$line" | sed -e 's,|.*,,'` + op=`echo "$line" | sed -e 's,^[^|]*|\([^|]*\)|.*$,\1,'` + file=`echo "$line" | sed -e 's,^[^|]*|[^|]*|,,'` + if test "$next_dir" != "$last_dir"; then + func_done_dir "$last_dir" "$last_dir_added" "$last_dir_removed" + last_dir="$next_dir" + last_dir_added= + last_dir_removed= + fi + case $op in + A) func_append last_dir_added "$file$nl";; + R) func_append last_dir_removed "$file$nl";; + esac + done + func_done_dir "$last_dir" "$last_dir_added" "$last_dir_removed" + exec 0<&5 5<&- + } + echo "Finished." echo echo "You may need to add #include directives for the following .h files." + # Intersect $specified_modules and $modules + # (since $specified_modules is not necessarily of subset of $modules - some + # may have been skipped through --avoid, and since the elements of $modules + # but not in $specified_modules can go away without explicit notice - through + # changes in the module dependencies). + echo "$specified_modules" > "$tmp"/modules1 # a sorted list, one module per line + echo "$modules" > "$tmp"/modules2 # also a sorted list, one module per line + # First the #include <...> directives without #ifs, sorted for convenience, + # then the #include "..." directives without #ifs, sorted for convenience, + # then the #include directives that are surrounded by #ifs. Not sorted. + for module in `LC_ALL=C join "$tmp"/modules1 "$tmp"/modules2`; do + include_directive=`func_get_include_directive "$module"` + case "$nl$include_directive" in + *"$nl#if"*) + echo "$include_directive" 1>&5 + ;; + *) + echo "$include_directive" | grep -v 'include "' 1>&6 + echo "$include_directive" | grep 'include "' 1>&7 + ;; + esac + done 5> "$tmp"/include-if 6> "$tmp"/include-angles 7> "$tmp"/include-quotes ( - # First the #include <...> directives without #ifs, sorted for convenience. - for module in $modules; do - if func_get_include_directive "$module" | grep '^#if' >/dev/null; then - : - else - func_get_include_directive "$module" | grep -v 'include "' - fi - done | LC_ALL=C sort -u - # Then the #include "..." directives without #ifs, sorted for convenience. - for module in $modules; do - if func_get_include_directive "$module" | grep '^#if' >/dev/null; then - : - else - func_get_include_directive "$module" | grep 'include "' - fi - done | LC_ALL=C sort -u - # Then the #include directives that are surrounded by #ifs. Not sorted. - for module in $modules; do - if func_get_include_directive "$module" | grep '^#if' >/dev/null; then - func_get_include_directive "$module" - fi - done - ) | sed -e '/^$/d;' -e 's/^/ /' + LC_ALL=C sort -u "$tmp"/include-angles + LC_ALL=C sort -u "$tmp"/include-quotes + cat "$tmp"/include-if + ) | sed -e '/^$/d' -e 's/^/ /' + rm -f "$tmp"/include-angles "$tmp"/include-quotes "$tmp"/include-if + + for module in $modules; do + func_get_link_directive "$module" + done \ + | LC_ALL=C sort -u | sed -e '/^$/d' -e 's/^/ /' > "$tmp"/link + if test `wc -l < "$tmp"/link` != 0; then + echo + echo "You may need to use the following Makefile variables when linking." + echo "Use them in _LDADD when linking a program, or" + echo "in _a_LDFLAGS or _la_LDFLAGS when linking a library." + cat "$tmp"/link + fi + rm -f "$tmp"/link + echo echo "Don't forget to" if test "$makefile_am" = Makefile.am; then @@ -2010,12 +2626,73 @@ func_create_testdir () { testdir="$1" modules="$2" + 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` + fi modules=`for m in $modules; do echo $m; done | LC_ALL=C sort -u` + # 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 + # on GPL modules - therefore we don't want a warning in this case. + inctests="" + for requested_module in $saved_modules; do + requested_license=`func_get_license "$requested_module"` + if test "$requested_license" != GPL; then + # Here we use func_modules_transitive_closure, not just + # func_get_dependencies, so that we also detect weird situations like + # an LGPL module which depends on a GPLed build tool module which depends + # on a GPL module. + modules="$requested_module" + func_modules_transitive_closure + for module in $modules; do + license=`func_get_license "$module"` + case "$license" in + 'GPLed build tool') ;; + 'public domain' | 'unlimited' | 'unmodifiable license text') ;; + *) + case "$requested_license" in + GPLv2+) + case "$license" in + GPLv2+ | LGPLv2+) ;; + *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + esac + ;; + LGPL) + case "$license" in + LGPL | LGPLv2+) ;; + *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + esac + ;; + LGPLv2+) + case "$license" in + LGPLv2+) ;; + *) echo "warning: module $requested_module depends on a module with an incompatible license: $module" 1>&2 ;; + esac + ;; + esac + ;; + esac + done + fi + done + modules="$saved_modules" + inctests="$saved_inctests" + # Subdirectory names. sourcebase=gllib m4base=glm4 + docbase=gldoc testsbase=gltests + macro_prefix=gl # Determine final module list. func_modules_transitive_closure @@ -2030,38 +2707,57 @@ func_create_testdir () echo "File list:" echo "$files" | sed -e 's/^/ /' + sed_rewrite_files="\ + s,^build-aux/,$auxdir/, + s,^doc/,$docbase/, + s,^lib/,$sourcebase/, + s,^m4/,$m4base/, + s,^tests/,$testsbase/," + # Create directories. - for d in `echo "$files" | sed -n -e 's,^\(.*\)/[^/]*,\1,p'`; do - case "$d" in - build-aux) mkdir -p "$testdir/$auxdir" ;; - lib) mkdir -p "$testdir/$sourcebase" ;; - m4) mkdir -p "$testdir/$m4base" ;; - tests) mkdir -p "$testdir/$testsbase" ;; - *) mkdir -p "$testdir/$d" ;; - esac - done + for f in $files; do echo $f; done \ + | sed -e "$sed_rewrite_files" \ + | sed -n -e 's,^\(.*\)/[^/]*,\1,p' \ + | LC_ALL=C sort -u \ + > "$tmp"/dirs + { # Rearrange file descriptors. Needed because "while ... done < ..." + # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. + exec 5<&0 < "$tmp"/dirs + while read d; do + mkdir -p "$testdir/$d" + done + exec 0<&5 5<&- + } # Copy files or make symbolic links. - for f in $files; do - func_lookup_file "$f" - case "$f" in - build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; - lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; - m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;; - tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;; - *) g="$f" ;; - esac - if test -n "$lookedup_tmp"; then - cp -p "$lookedup_file" "$testdir/$g" - else - ln "$lookedup_file" "$testdir/$g" 2>/dev/null || - if test -z "$symbolic"; then + delimiter=' ' + for f in $files; do echo $f; done \ + | sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_files" \ + | LC_ALL=C sort \ + > "$tmp"/files + { # Rearrange file descriptors. Needed because "while ... done < ..." + # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. + exec 5<&0 < "$tmp"/files + while read g f; do + func_lookup_file "$f" + if test -n "$lookedup_tmp"; then cp -p "$lookedup_file" "$testdir/$g" else - ln -s "$lookedup_file" "$testdir/$g" + ln "$lookedup_file" "$testdir/$g" 2>/dev/null || + if { test -n "$symbolic" \ + || { test -n "$lsymbolic" \ + && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; }; then + func_ln "$lookedup_file" "$testdir/$g" + else + cp -p "$lookedup_file" "$testdir/$g" + fi fi - fi - done + done + exec 0<&5 5<&- + } + + # Create Makefile.ams that are for testing. + for_test=true # Create $sourcebase/Makefile.am. mkdir -p "$testdir/$sourcebase" @@ -2083,13 +2779,13 @@ func_create_testdir () subdirs="$sourcebase $m4base" subdirs_with_configure_ac="" - if test -f "$testdir"/$m4base/gettext.m4; then + if false && test -f "$testdir"/$m4base/gettext.m4; then # Avoid stupid error message from automake: # "AM_GNU_GETTEXT used but `po' not in SUBDIRS" mkdir -p "$testdir/po" (echo "## Process this file with automake to produce Makefile.in." ) > "$testdir/po/Makefile.am" - subdirs="$subdirs po" + func_append subdirs " po" fi if test -n "$inctests"; then @@ -2113,14 +2809,13 @@ func_create_testdir () echo "AC_GNU_SOURCE" echo fi - if grep gl_USE_SYSTEM_EXTENSIONS "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then - echo "gl_USE_SYSTEM_EXTENSIONS" - echo - fi - if grep gl_LOCK "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then - echo "gl_LOCK_EARLY" - echo - fi + for module in $modules; do + func_verify_module + if test -n "$module"; then + func_get_autoconf_early_snippet "$module" + fi + done \ + | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' if test "$libtool" = true; then echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" echo "gl_cond_libtool=true" @@ -2138,20 +2833,17 @@ func_create_testdir () # expansion of the required macro before the current point, and only one # expansion total). echo "AC_DEFUN([gl_INIT], [" - if test "$auxdir" != "build-aux"; then - sed_replace_build_aux=' - :a - /AC_CONFIG_FILES(.*:build-aux\/.*)/{ - s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)| - ba - }' - sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'` - else - sed_replace_build_aux= - fi + func_emit_initmacro_start + sed_replace_build_aux=' + :a + /AC_CONFIG_FILES(.*:build-aux\/.*)/{ + s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)| + ba + }' # 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 @@ -2159,6 +2851,7 @@ func_create_testdir () | sed -e "$sed_replace_build_aux" fi done + echo "gl_source_base='.'" for module in $modules; do func_verify_tests_module if test -n "$module"; then @@ -2169,13 +2862,16 @@ func_create_testdir () # _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" | tr 'a-z' 'A-Z'` + libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z-' 'A-Z_'` echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" echo " AC_SUBST([${libname_upper}_LIBDEPS])" echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" fi + func_emit_initmacro_end echo "])" + func_emit_initmacro_done + echo echo "gl_INIT" echo # Usually $testsbase/config.h will be a superset of config.h. Verify this @@ -2184,7 +2880,7 @@ func_create_testdir () echo echo "AC_OUTPUT([Makefile])" ) > "$testdir/$testsbase/configure.ac" - subdirs="$subdirs $testsbase" + func_append subdirs " $testsbase" subdirs_with_configure_ac="$subdirs_with_configure_ac $testsbase" fi @@ -2212,23 +2908,32 @@ func_create_testdir () echo "AC_PROG_INSTALL" echo "AC_PROG_MAKE_SET" echo + echo "# For autobuild." + echo "AC_CANONICAL_BUILD" + echo "AC_CANONICAL_HOST" + echo echo "m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace" - echo "m4_pattern_allow([^gl_ES$])dnl a valid locale name" + 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 echo "AC_PROG_RANLIB" echo - if grep AC_GNU_SOURCE "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then - echo "AC_GNU_SOURCE" + if test -n "$uses_subdirs"; then + echo "AM_PROG_CC_C_O" echo fi - if grep gl_USE_SYSTEM_EXTENSIONS "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then - echo "gl_USE_SYSTEM_EXTENSIONS" - echo - fi - if grep gl_LOCK "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then - echo "gl_LOCK_EARLY" + if grep AC_GNU_SOURCE "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then + echo "AC_GNU_SOURCE" echo fi + for module in $modules; do + func_verify_nontests_module + if test -n "$module"; then + func_get_autoconf_early_snippet "$module" + fi + done \ + | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' if test "$libtool" = true; then echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" echo "gl_cond_libtool=true" @@ -2238,6 +2943,7 @@ func_create_testdir () echo "gl_libdeps=" echo "gl_ltlibdeps=" fi + echo "gl_source_base='$sourcebase'" # Wrap the set of autoconf snippets into an autoconf macro that is then # invoked. This is needed because autoconf does not support AC_REQUIRE # at the top level: @@ -2246,6 +2952,7 @@ func_create_testdir () # expansion of the required macro before the current point, and only one # expansion total). echo "AC_DEFUN([gl_INIT], [" + func_emit_initmacro_start if test "$auxdir" != "build-aux"; then sed_replace_build_aux=' :a @@ -2253,7 +2960,6 @@ func_create_testdir () s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| ba }' - sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'` else sed_replace_build_aux= fi @@ -2267,13 +2973,16 @@ func_create_testdir () # _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" | tr 'a-z' 'A-Z'` + libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z-' 'A-Z_'` echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" echo " AC_SUBST([${libname_upper}_LIBDEPS])" echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" fi + func_emit_initmacro_end echo "])" + func_emit_initmacro_done + echo echo "gl_INIT" echo if test -n "$subdirs_with_configure_ac"; then @@ -2285,7 +2994,7 @@ func_create_testdir () # configure.ac which creates the subdir's Makefile.am, not this one. case " $subdirs_with_configure_ac " in *" $d "*) ;; - *) makefiles="$makefiles $d/Makefile" ;; + *) func_append makefiles " $d/Makefile" ;; esac done echo "AC_OUTPUT([$makefiles])" @@ -2293,18 +3002,81 @@ func_create_testdir () # Create autogenerated files. (cd "$testdir" - echo "executing ${AUTORECONF} --force --install" - ${AUTORECONF} --force --install - ) - if grep '^BUILT_SOURCES *+=' "$testdir/$sourcebase/Makefile.am" > /dev/null; then + # Do not use "${AUTORECONF} --force --install", because it may invoke + # autopoint, which brings in older versions of some of our .m4 files. + if test -f $m4base/gettext.m4; then + echo "executing ${AUTOPOINT} --force" + ${AUTOPOINT} --force || func_exit 1 + for f in $m4base/*.m4~; do + mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1 + done + fi + echo "executing ${ACLOCAL} -I $m4base" + ${ACLOCAL} -I $m4base || func_exit 1 + if ! test -d build-aux; then + echo "executing mkdir build-aux" + mkdir build-aux || func_exit 1 + fi + echo "executing ${AUTOCONF}" + ${AUTOCONF} || func_exit 1 + echo "executing ${AUTOHEADER}" + ${AUTOHEADER} || func_exit 1 + echo "executing ${AUTOMAKE} --add-missing --copy" + ${AUTOMAKE} --add-missing --copy || func_exit 1 + ) || func_exit 1 + if test -n "$inctests"; then + # Create autogenerated files. + (cd "$testdir/$testsbase" || func_exit 1 + # Do not use "${AUTORECONF} --force --install", because it may invoke + # autopoint, which brings in older versions of some of our .m4 files. + if test -f ../$m4base/gettext.m4; then + echo "executing ${AUTOPOINT} --force" + ${AUTOPOINT} --force || func_exit 1 + for f in ../$m4base/*.m4~; do + mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1 + done + fi + echo "executing ${ACLOCAL} -I ../$m4base" + ${ACLOCAL} -I ../$m4base || func_exit 1 + if ! test -d ../build-aux; then + echo "executing mkdir ../build-aux" + mkdir ../build-aux + fi + echo "executing ${AUTOCONF}" + ${AUTOCONF} || func_exit 1 + echo "executing ${AUTOHEADER}" + ${AUTOHEADER} || func_exit 1 + echo "executing ${AUTOMAKE} --add-missing --copy" + ${AUTOMAKE} --add-missing --copy || func_exit 1 + ) || func_exit 1 + fi + # Need to run configure and make once, to create built files that are to be + # distributed (such as getdate.c). + # 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"` + distributed_built_sources=`for file in $built_sources; do + case "$cleaned_files" in + *" "$file" "*) ;; + *) echo $file ;; + esac; + done` + if test -n "$distributed_built_sources"; then (cd "$testdir" - ./configure + ./configure || func_exit 1 cd "$sourcebase" echo 'built_sources: $(BUILT_SOURCES)' >> Makefile - make built_sources + make built_sources || func_exit 1 cd .. - make distclean - ) + make distclean || func_exit 1 + ) || func_exit 1 fi } @@ -2324,13 +3096,50 @@ func_create_megatestdir () # First, all modules one by one. for onemodule in $allmodules; do func_create_testdir "$megatestdir/$onemodule" $onemodule - megasubdirs="${megasubdirs}$onemodule " + func_append megasubdirs "$onemodule " 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 != fnmatch-posix; then echo $m; fi; done` + allmodules=`for m in $allmodules; do if test $m != config-h && test $m != fnmatch-posix; then echo $m; fi; done` func_create_testdir "$megatestdir/ALL" "$allmodules" - megasubdirs="${megasubdirs}ALL" + func_append megasubdirs "ALL" + + # Create autobuild. + cvsdate=`sh "$gnulib_dir/build-aux/mdate-sh" "$gnulib_dir/CVS/Entries" \ + | sed -e 's,January,01,' -e 's,Jan,01,' \ + -e 's,February,02,' -e 's,Feb,02,' \ + -e 's,March,03,' -e 's,Mar,03,' \ + -e 's,April,04,' -e 's,Apr,04,' \ + -e 's,May,05,' \ + -e 's,June,06,' -e 's,Jun,06,' \ + -e 's,July,07,' -e 's,Jul,07,' \ + -e 's,August,08,' -e 's,Aug,08,' \ + -e 's,September,09,' -e 's,Sep,09,' \ + -e 's,October,10,' -e 's,Oct,10,' \ + -e 's,November,11,' -e 's,Nov,11,' \ + -e 's,December,12,' -e 's,Dec,12,' \ + -e 's,^,00,' -e 's,^[0-9]*\([0-9][0-9] \),\1,' \ + -e 's,^\([0-9]*\) \([0-9]*\) \([0-9]*\),\3\2\1,'` + (echo '#!/bin/sh' + echo "CVSDATE=$cvsdate" + echo "test -d logs || mkdir logs" + echo "for module in $megasubdirs; do" + echo " echo \"Working on module \$module...\"" + echo " safemodule=\`echo \$module | sed -e 's|/|-|g'\`" + echo " (echo \"To: gnulib@autobuild.josefsson.org\"" + echo " echo" + echo " set -x" + echo " : autobuild project... \$module" + echo " : autobuild revision... cvs-\$CVSDATE-000000" + echo " : autobuild timestamp... \`date \"+%Y%m%d-%H%M%S\"\`" + echo " : autobuild hostname... \`hostname\`" + echo " cd \$module && ./configure \$CONFIGURE_OPTIONS && make && make check && make distclean" + echo " echo rc=\$?" + echo " ) 2>&1 | { if test -n \"\$AUTOBUILD_SUBST\"; then sed -e \"\$AUTOBUILD_SUBST\"; else cat; fi; } > logs/\$safemodule" + echo "done" + ) > "$megatestdir/do-autobuild" + chmod a+x "$megatestdir/do-autobuild" # Create Makefile.am. (echo "## Process this file with automake to produce Makefile.in." @@ -2338,6 +3147,8 @@ func_create_megatestdir () echo "AUTOMAKE_OPTIONS = 1.5 foreign" echo echo "SUBDIRS = $megasubdirs" + echo + echo "EXTRA_DIST = do-autobuild" ) > "$megatestdir/Makefile.am" # Create configure.ac. @@ -2360,14 +3171,14 @@ func_create_megatestdir () # recursively, but the subdirectories are already finished, therefore # calling autoreconf here would only waste lots of CPU time. echo "executing ${ACLOCAL}" - ${ACLOCAL} + ${ACLOCAL} || func_exit 1 echo "executing mkdir build-aux" mkdir build-aux echo "executing ${AUTOCONF}" - ${AUTOCONF} + ${AUTOCONF} || func_exit 1 echo "executing ${AUTOMAKE} --add-missing --copy" - ${AUTOMAKE} --add-missing --copy - ) + ${AUTOMAKE} --add-missing --copy || func_exit 1 + ) || func_exit 1 } case $mode in @@ -2438,7 +3249,7 @@ case $mode in m4dirs= m4dirs_count=0 if test -f "$destdir"/Makefile.am; then - aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ ]*=' "$destdir"/Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/'` + aclocal_amflags=`sed -n 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/p' "$destdir"/Makefile.am` m4dir_is_next= for arg in $aclocal_amflags; do if test -n "$m4dir_is_next"; then @@ -2447,11 +3258,12 @@ case $mode in /*) ;; *) if test -f "$destdir/$arg"/gnulib-cache.m4; then - m4dirs="$m4dirs $arg" + 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 @@ -2495,9 +3307,10 @@ case $mode in # Perform func_import in a subshell, so that variable values # such as # local_gnulib_dir, avoidlist, sourcebase, m4base, docbase, - # testsbase, libname, lgpl, makefile_name, libtool, macro_prefix + # testsbase, inctests, libname, lgpl, makefile_name, libtool, + # macro_prefix # don't propagate from one directory to another. - (func_import) || exit 1 + (func_import) || func_exit 1 done else # Really ambiguous. @@ -2536,15 +3349,15 @@ case $mode in cd "$destdir" mkdir build cd build - ../configure - make - make check - make distclean + ../configure || func_exit 1 + make || func_exit 1 + make check || func_exit 1 + make distclean || func_exit 1 remaining=`find . -type f -print` if test -n "$remaining"; then echo "Remaining files:" $remaining 1>&2 echo "gnulib-tool: *** Stop." 1>&2 - exit 1 + func_exit 1 fi cd .. cd .. @@ -2567,7 +3380,7 @@ case $mode in if test -n "$remaining"; then echo "Remaining files:" $remaining 1>&2 echo "gnulib-tool: *** Stop." 1>&2 - exit 1 + func_exit 1 fi cd .. cd .. @@ -2634,6 +3447,16 @@ case $mode in done ;; + extract-link-directive ) + for module + do + func_verify_module + if test -n "$module"; then + func_get_link_directive "$module" + fi + done + ;; + extract-license ) for module do @@ -2670,12 +3493,12 @@ esac rm -rf "$tmp" # Undo the effect of the previous 'trap' command. Some shellology: -# We cannot use "trap - 0 1 2 3 15", because Solaris sh would attempt to +# We cannot use "trap - 0 1 2 3 13 15", because Solaris sh would attempt to # execute the command "-". "trap '' ..." is fine only for signal 0 (= normal # exit); for the others we need to call 'exit' explicitly. The value of $? is # 128 + signal number and is set before the trap-registered command is run. trap '' 0 -trap 'exit $?' 1 2 3 15 +trap 'func_exit $?' 1 2 3 13 15 exit 0