X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=519e461aaaf423bc1ee33128988644e035f783f4;hb=b2892d7fdc1ccddc18263320f389f5c06bff45a5;hp=971843f7d6cd18d09f40ce69ed84c97ac33e3879;hpb=b153ee54f12579c15cb3e8211da8001dfdd7cd0f;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index 971843f7d..519e461aa 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002-2006 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 @@ -13,8 +13,8 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # This program is meant for authors or maintainers which want to import @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2005-10-17 15:44:51 $' +cvsdatestamp='$Date: 2006-06-23 19:27:17 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -35,7 +35,23 @@ AUTOCONFPATH= # ;; #esac -AUTORECONF="${AUTOCONFPATH}autoreconf" +# You can set AUTOMAKEPATH to empty if automake 1.9.x is already in your PATH. +AUTOMAKEPATH= + +# If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the +# variables AUTOCONF, ACLOCAL, AUTOMAKE, AUTORECONF individually. +if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then + AUTOCONF="${AUTOCONFPATH}autoconf" +fi +if test -z "${ACLOCAL}" || test -n "${AUTOMAKEPATH}"; then + ACLOCAL="${AUTOMAKEPATH}aclocal" +fi +if test -z "${AUTOMAKE}" || test -n "${AUTOMAKEPATH}"; then + AUTOMAKE="${AUTOMAKEPATH}automake" +fi +if test -z "${AUTORECONF}" || test -n "${AUTOCONFPATH}"; then + AUTORECONF="${AUTOCONFPATH}autoreconf" +fi # func_usage # outputs to stdout the --help usage message. @@ -44,6 +60,7 @@ func_usage () echo "\ Usage: gnulib-tool --list gnulib-tool --import [module1 ... moduleN] + gnulib-tool --update gnulib-tool --create-testdir --dir=directory module1 ... moduleN gnulib-tool --create-megatestdir --dir=directory [module1 ... moduleN] gnulib-tool --test --dir=directory module1 ... moduleN @@ -60,7 +77,11 @@ Usage: gnulib-tool --list Operation modes: --list print the available module names - --import import the given modules into the current package + --import import the given modules into the current package; + if no modules are specified, update the current + package from the current gnulib + --update update the current package, restore files omitted + from CVS --create-testdir create a scratch package with the given modules --create-megatestdir create a mega scratch package with the given modules one by one and all together @@ -115,13 +136,29 @@ Report bugs to ." # outputs to stdout the --version message. func_version () { + year=`echo "$last_checkin_date" | sed -e 's,/.*$,,'` echo "$progname (GNU $package) $version" - echo "Copyright (C) 2002-2005 Free Software Foundation, Inc. + echo "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" } +# 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 "#" + echo "# This file is free software, distributed under the terms of the GNU" + echo "# General Public License. As a special exception to the GNU General" + echo "# Public License, this file may be distributed as part of a program" + echo "# that contains a configuration script generated by Autoconf, under" + echo "# the same distribution terms as the rest of that program." + echo "#" + echo "# Generated by gnulib-tool." +} + # func_tmpdir # creates a temporary directory. # Sets variable @@ -135,7 +172,7 @@ func_tmpdir () { # Use the mktemp program if available. If not available, hide the error # message. - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/glXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "$TMPDIR/glXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { @@ -237,6 +274,9 @@ func_ln_if_changed () --import | --impor | --impo | --imp | --im | --i ) mode=import shift ;; + --update | --updat | --upda | --upd | --up | --u ) + mode=update + shift ;; --create-testdir | --create-testdi | --create-testd | --create-test | --create-tes | --create-te | --create-t ) mode=create-testdir shift ;; @@ -349,7 +389,7 @@ func_ln_if_changed () --dry-run ) doit=false shift ;; - -s | --symbolic | --symlink ) + -s | --symbolic | --symboli | --symbol | --symbo | --symb | --symlink | --symlin | --symli | --syml | --sym | --sy ) symbolic=true shift ;; --help | --hel | --he | --h ) @@ -371,6 +411,26 @@ func_ln_if_changed () esac done + if test "$mode" = update; then + if test $# != 0; then + echo "gnulib-tool: too many arguments in 'update' mode" 1>&2 + echo "Try 'gnulib-tool --help' for more information." 1>&2 + echo "If you really want to modify the gnulib configuration of your project," 1>&2 + echo "you need to use 'gnulib --import' - at your own risk!" 1>&2 + exit 1 + fi + if test -n "$supplied_libname" || test -n "$sourcebase" || test -n "$m4base" \ + || test -n "$testsbase" || test -n "$auxdir" || test -n "$inctests" \ + || test -n "$avoidlist" || test -n "$lgpl" || test -n "$macro_prefix"; then + echo "gnulib-tool: invalid options for 'update' mode" 1>&2 + echo "Try 'gnulib-tool --help' for more information." 1>&2 + echo "If you really want to modify the gnulib configuration of your project," 1>&2 + echo "you need to use 'gnulib --import' - at your own risk!" 1>&2 + exit 1 + fi + do_changelog=false + fi + # Remove trailing slashes from the directory names. This is necessary for # m4base (to avoid an error in func_import) and optional for the others. sed_trimtrailingslashes='s,\([^/]\)//*$,\1,' @@ -604,6 +664,40 @@ func_modules_transitive_closure () done } +# func_modules_add_dummy +# Input: +# - modules list of modules, including dependencies +# Output: +# - modules list of modules, including 'dummy' if needed +func_modules_add_dummy () +{ + have_lib_SOURCES= + sed_remove_backslash_newline=':a +/\\$/{ +s/\\$// +N +s/\n// +ba +}' + for module in $modules; do + func_verify_nontests_module + if test -n "$module"; then + # Extract the value of "lib_SOURCES += ...". + for file in `func_get_automake_snippet "$module" | sed -e "$sed_remove_backslash_newline" | sed -n -e 's,^lib_SOURCES[ ]*+=\([^#]*\).*$,\1,p'`; do + # Ignore .h files since they are not compiled. + case "$file" in + *.h) ;; + *) have_lib_SOURCES=yes ;; + esac + done + fi + done + # Add the dummy module, to make sure the library will be non-empty. + if test -z "$have_lib_SOURCES"; then + modules="$modules dummy" + fi +} + # func_modules_to_filelist # Input: # - modules list of modules, including dependencies @@ -638,15 +732,7 @@ func_emit_lib_Makefile_am () perhapsLT= fi echo "## Process this file with automake to produce Makefile.in." - echo "# Copyright (C) 2004 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" - echo "# Public License, this file may be distributed as part of a program" - echo "# that contains a configuration script generated by Automake, under" - echo "# the same distribution terms as the rest of that program." - echo "#" - echo "# Generated by gnulib-tool." + func_emit_copyright_notice if test -n "$actioncmd"; then echo "# Reproduce by: $actioncmd" fi @@ -658,14 +744,18 @@ func_emit_lib_Makefile_am () echo echo "${libname}_${libext}_SOURCES =" echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@" + echo "noinst_HEADERS =" echo "EXTRA_DIST =" echo "BUILT_SOURCES =" echo "SUFFIXES =" echo "MOSTLYCLEANFILES =" + echo "MOSTLYCLEANDIRS =" echo "CLEANFILES =" echo "DISTCLEANFILES =" echo "MAINTAINERCLEANFILES =" echo + echo "AM_CPPFLAGS =" + echo for module in $modules; do func_verify_nontests_module if test -n "$module"; then @@ -688,6 +778,14 @@ func_emit_lib_Makefile_am () fi done echo + echo "mostlyclean-local:" + 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 echo "# Makefile.am ends here" } @@ -709,28 +807,27 @@ func_emit_tests_Makefile_am () fi testsbase_inverse=`echo "$testsbase" | sed -e 's,/$,,' | sed -e 's,[^/][^/]*,..,g'` echo "## Process this file with automake to produce Makefile.in." - echo "# Copyright (C) 2004-2005 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" - echo "# Public License, this file may be distributed as part of a program" - echo "# that contains a configuration script generated by Automake, under" - echo "# the same distribution terms as the rest of that program." - echo "#" - echo "# Generated by gnulib-tool." + func_emit_copyright_notice echo # Generate dependencies here, since it eases the debugging of test failures. echo "AUTOMAKE_OPTIONS = 1.5 foreign" echo echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}" echo + # Nothing is being added to SUBDIRS; nevertheless the existence of this + # variable is needed to avoid an error from automake: + # "AM_GNU_GETTEXT used but SUBDIRS not defined" + echo "SUBDIRS =" echo "TESTS =" echo "TESTS_ENVIRONMENT =" echo "noinst_PROGRAMS =" + echo "check_PROGRAMS =" + echo "noinst_HEADERS =" echo "EXTRA_DIST =" echo "BUILT_SOURCES =" echo "SUFFIXES =" echo "MOSTLYCLEANFILES =" + echo "MOSTLYCLEANDIRS =" echo "CLEANFILES =" echo "DISTCLEANFILES =" echo "MAINTAINERCLEANFILES =" @@ -761,6 +858,14 @@ func_emit_tests_Makefile_am () echo "clean-local:" echo " rm -rf SunWS_cache" echo + echo "mostlyclean-local:" + 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 echo "# Makefile.am ends here" } @@ -909,12 +1014,15 @@ func_import () echo "Module list with included dependencies:" echo "$modules" | sed -e 's/^/ /' + # Add the dummy module if needed. + func_modules_add_dummy + # If --lgpl, check the license of modules are compatible. if test -n "$lgpl"; then for module in $modules; do license=`func_get_license $module` case $license in - LGPL | 'public domain' | 'unlimited') ;; + LGPL | 'GPLed build tool' | 'public domain' | 'unlimited') ;; *) func_fatal_error "incompatible license on module $module: $license" ;; esac done @@ -971,15 +1079,33 @@ func_import () fi fi - # Copy files or make symbolic links. Remove obsolete files. func_tmpdir trap 'rm -rf "$tmp"' 0 1 2 3 15 + # func_dest_tmpfilename file + # determines the name of a temporary file (file is relative to destdir). + # Sets variable: + # - tmpfile absolute filename of the temporary file + func_dest_tmpfilename () + { + if $doit; then + # Put the new contents of $file in a file in the same directory (needed + # to guarantee that an 'mv' to "$destdir/$file" works). + tmpfile="$destdir/$1.tmp" + else + # Put the new contents of $file in a file in a temporary directory + # (because the directory of "$file" might not exist). + tmpfile="$tmp"/`basename "$1"`.tmp + fi + } + + # Copy files or make symbolic links. Remove obsolete files. delimiter=' ' for f in $old_files; do case "$f" in build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; 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" @@ -989,12 +1115,14 @@ func_import () 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 echo "$g""$delimiter""$f" done | LC_ALL=C sort > "$tmp"/new-files # First the files that are in old-files, but not in new-files: - for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e 's,'"$delimiter"'.*,,'`; do + sed_take_first_column='s,'"$delimiter"'.*,,' + for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_first_column"`; do # Remove the file. Do nothing if the user already removed it. if test -f "$destdir/$g"; then if $doit; then @@ -1009,20 +1137,21 @@ func_import () # Uses parameters f, g, already_present. func_add_or_update () { - cp "$gnulib_dir/$f" "$destdir/$g.tmp" || func_fatal_error "failed" + func_dest_tmpfilename "$g" + cp "$gnulib_dir/$f" "$tmpfile" || func_fatal_error "failed" if test -n "$lgpl"; then # Update license. case "$f" in lib/*) sed -e 's/GNU General/GNU Lesser General/g' \ -e 's/version 2\([ ,]\)/version 2.1\1/g' \ - < "$gnulib_dir/$f" > "$destdir/$g.tmp" || func_fatal_error "failed" + < "$gnulib_dir/$f" > "$tmpfile" || func_fatal_error "failed" ;; esac fi if test -f "$destdir/$g"; then # The file already exists. - if cmp "$destdir/$g" "$destdir/$g.tmp" > /dev/null; then + if cmp "$destdir/$g" "$tmpfile" > /dev/null; then : # The file has not changed. else # Replace the file. @@ -1033,10 +1162,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" && cmp "$gnulib_dir/$f" "$destdir/$g.tmp" > /dev/null; then + if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$tmpfile" > /dev/null; then func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g" else - mv -f "$destdir/$g.tmp" "$destdir/${g}" || func_fatal_error "failed" + mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" fi else if test -n "$already_present"; then @@ -1052,41 +1181,42 @@ func_import () # frequently that developers don't put autogenerated files into CVS. if $doit; then echo "Copying file $g" - if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$destdir/$g.tmp" > /dev/null; then + if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$tmpfile" > /dev/null; then func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g" else - mv -f "$destdir/$g.tmp" "$destdir/${g}" || func_fatal_error "failed" + mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" fi else echo "Copy file $g" fi fi - rm -f "$destdir/$g.tmp" + 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 's,'^.*"$delimiter"',,'`; do + 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/,"` ;; 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 # 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 's,'^.*"$delimiter"',,'`; do + 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/,"` ;; 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 - rm -rf "$tmp" - trap - 0 1 2 3 15 # Command-line invocation printed in a comment in generated gnulib-cache.m4. actioncmd="gnulib-tool --import" @@ -1108,40 +1238,35 @@ func_import () actioncmd="$actioncmd `echo $specified_modules`" # Create lib/Makefile.am. - func_emit_lib_Makefile_am > "$destdir"/$sourcebase/Makefile.am.tmp + func_dest_tmpfilename $sourcebase/Makefile.am + func_emit_lib_Makefile_am > "$tmpfile" if test -f "$destdir"/$sourcebase/Makefile.am; then - if cmp "$destdir"/$sourcebase/Makefile.am "$destdir"/$sourcebase/Makefile.am.tmp > /dev/null; then - rm -f "$destdir"/$sourcebase/Makefile.am.tmp + if cmp "$destdir"/$sourcebase/Makefile.am "$tmpfile" > /dev/null; then + rm -f "$tmpfile" else if $doit; then echo "Updating $sourcebase/Makefile.am (backup in $sourcebase/Makefile.am~)" mv -f "$destdir"/$sourcebase/Makefile.am "$destdir"/$sourcebase/Makefile.am~ - mv -f "$destdir"/$sourcebase/Makefile.am.tmp "$destdir"/$sourcebase/Makefile.am + mv -f "$tmpfile" "$destdir"/$sourcebase/Makefile.am else echo "Update $sourcebase/Makefile.am (backup in $sourcebase/Makefile.am~)" - rm -f "$destdir"/$sourcebase/Makefile.am.tmp + rm -f "$tmpfile" fi fi else if $doit; then echo "Creating $sourcebase/Makefile.am" - mv -f "$destdir"/$sourcebase/Makefile.am.tmp "$destdir"/$sourcebase/Makefile.am + mv -f "$tmpfile" "$destdir"/$sourcebase/Makefile.am else echo "Create $sourcebase/Makefile.am" - rm -f "$destdir"/$sourcebase/Makefile.am.tmp + rm -f "$tmpfile" fi fi # Create m4/gnulib-cache.m4. + func_dest_tmpfilename $m4base/gnulib-cache.m4 ( - echo "# Copyright (C) 2004 Free Software Foundation, Inc." - echo "# This file is free software, distributed under the terms of the GNU" - echo "# General Public License. As a special exception to the GNU General" - echo "# Public License, this file may be distributed as part of a program" - echo "# that contains a configuration script generated by Autoconf, under" - echo "# the same distribution terms as the rest of that program." - echo "#" - echo "# Generated by gnulib-tool." + func_emit_copyright_notice echo "#" echo "# This file represents the specification of how gnulib-tool is used." echo "# It acts as a cache: It is written and read by gnulib-tool." @@ -1162,46 +1287,40 @@ func_import () test -z "$lgpl" || echo "gl_LGPL" test -z "$libtool" || echo "gl_LIBTOOL" echo "gl_MACRO_PREFIX([$macro_prefix])" - ) > "$destdir"/$m4base/gnulib-cache.m4.tmp + ) > "$tmpfile" if test -f "$destdir"/$m4base/gnulib-cache.m4; then - if cmp "$destdir"/$m4base/gnulib-cache.m4 "$destdir"/$m4base/gnulib-cache.m4.tmp > /dev/null; then - rm -f "$destdir"/$m4base/gnulib-cache.m4.tmp + if cmp "$destdir"/$m4base/gnulib-cache.m4 "$tmpfile" > /dev/null; then + rm -f "$tmpfile" else if $doit; then echo "Updating $m4base/gnulib-cache.m4 (backup in $m4base/gnulib-cache.m4~)" mv -f "$destdir"/$m4base/gnulib-cache.m4 "$destdir"/$m4base/gnulib-cache.m4~ - mv -f "$destdir"/$m4base/gnulib-cache.m4.tmp "$destdir"/$m4base/gnulib-cache.m4 + mv -f "$tmpfile" "$destdir"/$m4base/gnulib-cache.m4 else echo "Update $m4base/gnulib-cache.m4 (backup in $m4base/gnulib-cache.m4~)" if false; then - cat "$destdir"/$m4base/gnulib-cache.m4.tmp + cat "$tmpfile" echo echo "# gnulib-cache.m4 ends here" fi - rm -f "$destdir"/$m4base/gnulib-cache.m4.tmp + rm -f "$tmpfile" fi fi else if $doit; then echo "Creating $m4base/gnulib-cache.m4" - mv -f "$destdir"/$m4base/gnulib-cache.m4.tmp "$destdir"/$m4base/gnulib-cache.m4 + mv -f "$tmpfile" "$destdir"/$m4base/gnulib-cache.m4 else echo "Create $m4base/gnulib-cache.m4" - cat "$destdir"/$m4base/gnulib-cache.m4.tmp - rm -f "$destdir"/$m4base/gnulib-cache.m4.tmp + cat "$tmpfile" + rm -f "$tmpfile" fi fi # Create m4/gnulib-comp.m4. + func_dest_tmpfilename $m4base/gnulib-comp.m4 ( - echo "# Copyright (C) 2004 Free Software Foundation, Inc." - echo "# This file is free software, distributed under the terms of the GNU" - echo "# General Public License. As a special exception to the GNU General" - echo "# Public License, this file may be distributed as part of a program" - echo "# that contains a configuration script generated by Autoconf, under" - echo "# the same distribution terms as the rest of that program." - echo "#" - echo "# Generated by gnulib-tool." + func_emit_copyright_notice echo "#" echo "# This file represents the compiled summary of the specification in" echo "# gnulib-cache.m4. It lists the computed macro invocations that need" @@ -1214,22 +1333,45 @@ func_import () echo "# any checks for libraries, header files, types and library functions." echo "AC_DEFUN([${macro_prefix}_EARLY]," echo "[" - if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 > /dev/null; then + echo " AC_REQUIRE([AC_PROG_RANLIB])" + 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; then + 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])" + fi 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 "[" + if test -z "$libtool"; then + echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" + else + echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" + fi + 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 for module in $modules; do func_verify_module if test -n "$module"; then - func_get_autoconf_snippet "$module" | sed -e '/^$/d;' -e 's/^/ /' -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./' + func_get_autoconf_snippet "$module" \ + | sed -e '/^$/d;' -e 's/^/ /' \ + -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./' \ + -e "$sed_replace_build_aux" if test "$module" = 'alloca' && test -n "$libtool"; then echo 'changequote(,)dnl' echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' @@ -1245,69 +1387,100 @@ func_import () echo "AC_DEFUN([${macro_prefix}_FILE_LIST], [" echo "$files" | sed -e 's,^, ,' echo "])" - ) > "$destdir"/$m4base/gnulib-comp.m4.tmp + ) > "$tmpfile" if test -f "$destdir"/$m4base/gnulib-comp.m4; then - if cmp "$destdir"/$m4base/gnulib-comp.m4 "$destdir"/$m4base/gnulib-comp.m4.tmp > /dev/null; then - rm -f "$destdir"/$m4base/gnulib-comp.m4.tmp + if cmp "$destdir"/$m4base/gnulib-comp.m4 "$tmpfile" > /dev/null; then + rm -f "$tmpfile" else if $doit; then echo "Updating $m4base/gnulib-comp.m4 (backup in $m4base/gnulib-comp.m4~)" mv -f "$destdir"/$m4base/gnulib-comp.m4 "$destdir"/$m4base/gnulib-comp.m4~ - mv -f "$destdir"/$m4base/gnulib-comp.m4.tmp "$destdir"/$m4base/gnulib-comp.m4 + mv -f "$tmpfile" "$destdir"/$m4base/gnulib-comp.m4 else echo "Update $m4base/gnulib-comp.m4 (backup in $m4base/gnulib-comp.m4~)" if false; then - cat "$destdir"/$m4base/gnulib-comp.m4.tmp + cat "$tmpfile" echo echo "# gnulib-comp.m4 ends here" fi - rm -f "$destdir"/$m4base/gnulib-comp.m4.tmp + rm -f "$tmpfile" fi fi else if $doit; then echo "Creating $m4base/gnulib-comp.m4" - mv -f "$destdir"/$m4base/gnulib-comp.m4.tmp "$destdir"/$m4base/gnulib-comp.m4 + mv -f "$tmpfile" "$destdir"/$m4base/gnulib-comp.m4 else echo "Create $m4base/gnulib-comp.m4" - cat "$destdir"/$m4base/gnulib-comp.m4.tmp - rm -f "$destdir"/$m4base/gnulib-comp.m4.tmp + cat "$tmpfile" + rm -f "$tmpfile" fi fi if test -n "$inctests"; then # Create tests/Makefile.am. - func_emit_tests_Makefile_am > "$destdir"/$testsbase/Makefile.am.tmp + func_dest_tmpfilename $testsbase/Makefile.am + func_emit_tests_Makefile_am > "$tmpfile" if test -f "$destdir"/$testsbase/Makefile.am; then - if cmp "$destdir"/$testsbase/Makefile.am "$destdir"/$testsbase/Makefile.am.tmp > /dev/null; then - rm -f "$destdir"/$testsbase/Makefile.am.tmp + if cmp "$destdir"/$testsbase/Makefile.am "$tmpfile" > /dev/null; then + rm -f "$tmpfile" else if $doit; then echo "Updating $testsbase/Makefile.am (backup in $testsbase/Makefile.am~)" mv -f "$destdir"/$testsbase/Makefile.am "$destdir"/$testsbase/Makefile.am~ - mv -f "$destdir"/$testsbase/Makefile.am.tmp "$destdir"/$testsbase/Makefile.am + mv -f "$tmpfile" "$destdir"/$testsbase/Makefile.am else echo "Update $testsbase/Makefile.am (backup in $testsbase/Makefile.am~)" - rm -f "$destdir"/$testsbase/Makefile.am.tmp + rm -f "$tmpfile" fi fi else if $doit; then echo "Creating $testsbase/Makefile.am" - mv -f "$destdir"/$testsbase/Makefile.am.tmp "$destdir"/$testsbase/Makefile.am + mv -f "$tmpfile" "$destdir"/$testsbase/Makefile.am else echo "Create $testsbase/Makefile.am" - rm -f "$destdir"/$testsbase/Makefile.am.tmp + rm -f "$tmpfile" fi fi fi + 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 + # 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 + echo "Finished." echo echo "You may need to add #include directives for the following .h files." - for module in $modules; do - func_get_include_directive "$module" - done | LC_ALL=C sort -u | sed -e '/^$/d;' -e 's/^/ /' + ( + # 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/^/ /' echo echo "Don't forget to" echo " - add \"$sourcebase/Makefile\" to AC_CONFIG_FILES in $configure_ac," @@ -1341,6 +1514,9 @@ func_create_testdir () echo "Module list with included dependencies:" echo "$modules" | sed -e 's/^/ /' + # Add the dummy module if needed. + func_modules_add_dummy + # Determine final file list. func_modules_to_filelist echo "File list:" @@ -1418,27 +1594,49 @@ func_create_testdir () echo "AC_PROG_MAKE_SET" echo "AC_PROG_RANLIB" echo - if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 > /dev/null; then + if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then echo "AC_GNU_SOURCE" echo fi - if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 > /dev/null; then + if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then echo "gl_USE_SYSTEM_EXTENSIONS" echo fi + if grep gl_LOCK "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then + echo "gl_LOCK" + echo + fi + if test -z "$libtool"; then + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" + else + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" + fi + 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 # 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. for module in $modules; do func_verify_nontests_module if test -n "$module"; then - func_get_autoconf_snippet "$module" + func_get_autoconf_snippet "$module" \ + | sed -e "$sed_replace_build_aux" fi done for module in $modules; do func_verify_tests_module if test -n "$module"; then - func_get_autoconf_snippet "$module" + func_get_autoconf_snippet "$module" \ + | sed -e "$sed_replace_build_aux" fi done echo @@ -1477,18 +1675,39 @@ func_create_testdir () echo "AC_PROG_MAKE_SET" echo "AC_PROG_RANLIB" echo - if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 > /dev/null; then + if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then echo "AC_GNU_SOURCE" echo fi - if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 > /dev/null; then + if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then echo "gl_USE_SYSTEM_EXTENSIONS" echo fi + if grep gl_LOCK "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then + echo "gl_LOCK" + echo + fi + if test -z "$libtool"; then + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" + else + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" + fi + 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 for module in $modules; do func_verify_nontests_module if test -n "$module"; then - func_get_autoconf_snippet "$module" + func_get_autoconf_snippet "$module" \ + | sed -e "$sed_replace_build_aux" fi done echo @@ -1571,8 +1790,17 @@ func_create_megatestdir () # Create autogenerated files. (cd "$megatestdir" - echo "executing ${AUTORECONF} --install" - ${AUTORECONF} --install + # Do not use "${AUTORECONF} --install", because autoreconf operates + # recursively, but the subdirectories are already finished, therefore + # calling autoreconf here would only waste lots of CPU time. + echo "executing ${ACLOCAL}" + ${ACLOCAL} + echo "executing mkdir build-aux" + mkdir build-aux + echo "executing ${AUTOCONF}" + ${AUTOCONF} + echo "executing ${AUTOMAKE} --add-missing --copy" + ${AUTOMAKE} --add-missing --copy ) } @@ -1584,7 +1812,8 @@ case $mode in func_all_modules ;; - import ) + import | update ) + # Where to import. if test -z "$destdir"; then destdir=.