X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=4b814de11884fa88bd77ba2a11aa7a3df00ae253;hb=b0d3c1545196ae640d1f6de6c084f15812a9650a;hp=0748a20b3e3a72423294385b4afa8acdc9cb1e6b;hpb=58c245d000b1a6e7eebc3ba6949b82abc87d6e70;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index 0748a20b3..4b814de11 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-09-19 15:29:40 $' +cvsdatestamp='$Date: 2006-07-29 13:10:38 $' 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 @@ -79,21 +100,29 @@ Operation modes: --extract-maintainer report the maintainer(s) inside gnulib --extract-tests-module report the unit test module, if it exists -Options: - --dir=DIRECTORY specify the target directory +General options: + --dir=DIRECTORY Specify the target directory. For --import, this specifies where your configure.ac can be found. Defaults to current directory. + --assume-autoconf=VERSION + Assume a given autoconf version (or newer). + If VERSION is 'latest-stable', assume the latest + stable version. + +Options for --import: --lib=LIBRARY Specify the library name. Defaults to 'libgnu'. --source-base=DIRECTORY - Directory relative --dir where source code is - placed (default \"lib\"), for --import. - --m4-base=DIRECTORY Directory relative --dir where *.m4 macros are - placed (default \"m4\"), for --import. + Directory relative to --dir where source code is + placed (default \"lib\"). + --m4-base=DIRECTORY Directory relative to --dir where *.m4 macros are + placed (default \"m4\"). + --doc-base=DIRECTORY Directory relative to --dir where doc files are + placed (default \"doc\"). --tests-base=DIRECTORY - Directory relative --dir where unit tests are - placed (default \"tests\"), for --import. - --aux-dir=DIRECTORY Directory relative --dir where auxiliary build + Directory relative to --dir where unit tests are + placed (default \"tests\"). + --aux-dir=DIRECTORY Directory relative to --dir where auxiliary build tools are placed (default \"build-aux\"). --with-tests Include unit tests for the included modules. --avoid=MODULE Avoid including the given MODULE. Useful if you @@ -101,10 +130,12 @@ Options: This option can be repeated. --lgpl Abort if modules aren't available under the LGPL. Also modify license template from GPL to LGPL. - --libtool Use libtool rules, for --import. + --libtool Use libtool rules. --macro-prefix=PREFIX Specify the prefix of the macros 'gl_EARLY' and 'gl_INIT'. Default is 'gl'. --no-changelog don't update or create ChangeLog files + +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. @@ -115,13 +146,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 +182,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" } || { @@ -162,56 +209,35 @@ func_fatal_error () exit 1 } -# func_cp_if_changed SRC DEST -# Like cp, but avoids munging timestamps if the file hasn't changed. -# Uses also the variables -# - dry_run true if actions shall only be printed, blank otherwise -func_cp_if_changed () -{ - if test $# -ne 2; then - echo "usage: func_cp_if_changed SRC DEST" >&2 - fi - test -n "$dry_run" && dry=echo - if cmp "$1" "$2" >/dev/null 2>&1; then - : - else - $dry cp -p "$1" "$2" - fi -} - -# func_mv_if_changed SRC DEST -# Like mv, but avoids munging timestamps if the file hasn't changed. -# Removes SRC if it is not renamed. -# Uses also the variables -# - dry_run true if actions shall only be printed, blank otherwise -func_mv_if_changed () -{ - if test $# -ne 2; then - echo "usage: func_mv_if_changed SRC DEST" >&2 - fi - test -n "$dry_run" && dry=echo - if cmp "$1" "$2" >/dev/null 2>&1; then - $dry rm "$1" - else - $dry mv "$1" "$2" - fi -} +# func_readlink SYMLINK +# outputs the target of the given symlink. +if (type -p readlink) > /dev/null 2>&1; then + func_readlink () + { + # Use the readlink program from GNU coreutils. + readlink "$1" + } +else + func_readlink () + { + # Use two sed invocations. A single sed -n -e 's,^.* -> \(.*\)$,\1,p' + # would do the wrong thing if the link target contains " -> ". + LC_ALL=C ls -l "$1" | sed -e 's, -> ,#%%#,' | sed -n -e 's,^.*#%%#\(.*\)$,\1,p' + } +fi # func_ln_if_changed SRC DEST # Like ln -s, but avoids munging timestamps if the link is correct. -# Uses also the variables -# - dry_run true if actions shall only be printed, blank otherwise func_ln_if_changed () { if test $# -ne 2; then echo "usage: func_ln_if_changed SRC DEST" >&2 fi - test -n "$dry_run" && dry=echo - if test -L "$2" -a "$1" = "`readlink "$2"`"; then + if test -L "$2" && test "$1" = "`func_readlink "$2"`"; then : else - $dry rm -f "$2" - $dry ln -s "$1" "$2" + rm -f "$2" + ln -s "$1" "$2" fi } @@ -222,14 +248,17 @@ func_ln_if_changed () # - libname, supplied_libname from --lib # - sourcebase from --source-base # - m4base from --m4-base +# - docbase from --doc-base # - testsbase from --tests-base # - auxdir from --aux-dir # - inctests true if --with-tests was given, blank otherwise # - avoidlist list of modules to avoid, from --avoid # - lgpl true if --lgpl was given, blank otherwise # - libtool true if --libtool was given, blank otherwise +# - macro_prefix from --macro-prefix +# - autoconf_minversion minimum supported autoconf version # - do_changelog false if --no-changelog was given, : otherwise -# - dry_run true if --dry-run was given, blank otherwise +# - doit : if actions shall be executed, false if only to be printed { mode= destdir= @@ -237,6 +266,7 @@ func_ln_if_changed () supplied_libname= sourcebase= m4base= + docbase= testsbase= auxdir= inctests= @@ -244,8 +274,9 @@ func_ln_if_changed () lgpl= libtool= macro_prefix= + autoconf_minversion= do_changelog=: - dry_run= + doit=: symbolic= supplied_opts="$@" @@ -258,6 +289,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 ;; @@ -315,6 +349,16 @@ func_ln_if_changed () --m4-base=* ) m4base=`echo "X$1" | sed -e 's/^X--m4-base=//'` shift ;; + --doc-base ) + shift + if test $# = 0; then + func_fatal_error "missing argument for --doc-base" + fi + docbase=$1 + shift ;; + --doc-base=* ) + docbase=`echo "X$1" | sed -e 's/^X--doc-base=//'` + shift ;; --tests-base ) shift if test $# = 0; then @@ -364,13 +408,23 @@ func_ln_if_changed () --macro-prefix=* ) macro_prefix=`echo "X$1" | sed -e 's/^X--macro-prefix=//'` shift ;; + --assume-autoconf ) + shift + if test $# = 0; then + func_fatal_error "missing argument for --assume-autoconf" + fi + autoconf_minversion="$1" + shift ;; + --assume-autoconf=* ) + autoconf_minversion=`echo "X$1" | sed -e 's/^X--assume-autoconf=//'` + shift ;; --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch | --no-c ) do_changelog=false shift ;; --dry-run ) - dry_run=true + 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 ) @@ -380,7 +434,7 @@ func_ln_if_changed () func_version exit 0 ;; -- ) - # Stop option prcessing + # Stop option processing shift break ;; -* ) @@ -391,6 +445,52 @@ func_ln_if_changed () break ;; 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 "$docbase" || test -n "$testsbase" || test -n "$auxdir" \ + || test -n "$inctests" || test -n "$avoidlist" || test -n "$lgpl" \ + || test -n "$macro_prefix" || test -n "$autoconf_minversion"; 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 + + DEFAULT_AUTOCONF_MINVERSION="2.59" + case "$autoconf_minversion" in + 1.* | 2.[0-4]* | 2.5[0-8]*) + func_fatal_error "minimum supported autoconf version is 2.59" ;; + esac + + # 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,' + case "$sourcebase" in + */ ) sourcebase=`echo "$sourcebase" | sed -e "$sed_trimtrailingslashes"` ;; + esac + case "$m4base" in + */ ) m4base=`echo "$m4base" | sed -e "$sed_trimtrailingslashes"` ;; + esac + case "$docbase" in + */ ) docbase=`echo "$docbase" | sed -e "$sed_trimtrailingslashes"` ;; + esac + case "$testsbase" in + */ ) testsbase=`echo "$testsbase" | sed -e "$sed_trimtrailingslashes"` ;; + esac + case "$auxdir" in + */ ) auxdir=`echo "$auxdir" | sed -e "$sed_trimtrailingslashes"` ;; + esac } case "$0" in @@ -409,9 +509,7 @@ case "$0" in esac while test -h "$self_abspathname"; do # Resolve symbolic link. - sedexpr1='s, -> ,#%%#,' - sedexpr2='s,^.*#%%#\(.*\)$,\1,p' - linkval=`LC_ALL=C ls -l "$self_abspathname" | sed -e "$sedexpr1" | sed -n -e "$sedexpr2"` + linkval=`func_readlink "$self_abspathname"` test -n "$linkval" || break case "$linkval" in /* ) self_abspathname="$linkval" ;; @@ -429,7 +527,7 @@ func_all_modules () (cd "$gnulib_dir/modules" && ls -1) \ | sed -e '/^CVS$/d' -e '/^ChangeLog$/d' -e '/^README$/d' -e '/^TEMPLATE$/d' -e '/^TEMPLATE-TESTS$/d' -e '/~$/d' \ | sed -e '/-tests$/d' \ - | sort + | LC_ALL=C sort } # func_verify_module @@ -467,17 +565,17 @@ func_verify_tests_module () esac } -sed_extract_prog=':[ ]*$/ { +sed_extract_prog=':[ ]*$/ { :a n - s/^Description:[ ]*$// - s/^Files:[ ]*$// - s/^Depends-on:[ ]*$// - s/^configure\.ac:[ ]*$// - s/^Makefile\.am:[ ]*$// - s/^Include:[ ]*$// - s/^License:[ ]*$// - s/^Maintainer:[ ]*$// + s/^Description:[ ]*$// + s/^Files:[ ]*$// + s/^Depends-on:[ ]*$// + s/^configure\.ac:[ ]*$// + s/^Makefile\.am:[ ]*$// + s/^Include:[ ]*$// + s/^License:[ ]*$// + s/^Maintainer:[ ]*$// tb p ba @@ -494,8 +592,12 @@ func_get_description () func_get_filelist () { sed -n -e "/^Files$sed_extract_prog" < "$gnulib_dir/modules/$1" - #echo m4/onceonly.m4 - echo m4/onceonly_2_57.m4 + case "$autoconf_minversion" in + 2.59) + #echo m4/onceonly.m4 + echo m4/onceonly_2_57.m4 + ;; + esac } # func_get_dependencies module @@ -576,7 +678,7 @@ func_modules_transitive_closure () func_verify_module if test -n "$module"; then # Duplicate dependencies are harmless, but Jim wants a warning. - duplicated_deps=`func_get_dependencies $module | sort | uniq -d` + 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 @@ -603,7 +705,7 @@ func_modules_transitive_closure () fi fi done - xmodules=`for m in $xmodules; do echo $m; done | sort | uniq` + xmodules=`for m in $xmodules; do echo $m; done | LC_ALL=C sort | LC_ALL=C uniq` if test "$xmodules" = "$modules"; then break fi @@ -611,6 +713,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 @@ -625,7 +761,7 @@ func_modules_to_filelist () files="$files "`func_get_filelist $module` fi done - files=`for f in $files; do echo $f; done | sort | uniq` + files=`for f in $files; do echo $f; done | LC_ALL=C sort | LC_ALL=C uniq` } # func_emit_lib_Makefile_am @@ -645,15 +781,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 @@ -665,14 +793,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 @@ -684,7 +816,7 @@ func_emit_lib_Makefile_am () fi } > amsnippet.tmp # Skip the contents if its entirely empty. - if grep '[^ ]' amsnippet.tmp > /dev/null ; then + if grep '[^ ]' amsnippet.tmp > /dev/null ; then echo "## begin gnulib module $module" echo cat amsnippet.tmp @@ -695,6 +827,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" } @@ -705,6 +845,8 @@ func_emit_lib_Makefile_am () # - libname library name # - libtool true if libtool will be used, blank otherwise # - sourcebase relative directory containing lib source code +# - m4base relative directory containing autoconf macros +# - testsbase relative directory containing unit test code func_emit_tests_Makefile_am () { if test -n "$libtool"; then @@ -712,45 +854,46 @@ func_emit_tests_Makefile_am () else libext=a 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 ../m4" + 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 =" echo echo "AM_CPPFLAGS = \\" echo " -I. -I\$(srcdir) \\" - echo " -I.. -I\$(srcdir)/.. \\" - echo " -I../${sourcebase-lib} -I\$(srcdir)/../${sourcebase-lib}" + echo " -I${testsbase_inverse} -I\$(srcdir)/${testsbase_inverse} \\" + echo " -I${testsbase_inverse}/${sourcebase-lib} -I\$(srcdir)/${testsbase_inverse}/${sourcebase-lib}" echo - echo "LDADD = ../${sourcebase-lib}/${libname}.${libext}" + echo "LDADD = ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}" echo for module in $modules; do func_verify_tests_module if test -n "$module"; then func_get_automake_snippet "$module" > amsnippet.tmp # Skip the contents if its entirely empty. - if grep '[^ ]' amsnippet.tmp > /dev/null ; then + if grep '[^ ]' amsnippet.tmp > /dev/null ; then echo "## begin gnulib module $module" echo cat amsnippet.tmp @@ -764,6 +907,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" } @@ -773,13 +924,17 @@ func_emit_tests_Makefile_am () # - libname library name # - sourcebase directory relative to destdir where to place source code # - m4base directory relative to destdir where to place *.m4 macros +# - docbase directory relative to destdir where to place doc files +# - testsbase directory relative to destdir where to place unit test code # - auxdir directory relative to destdir where to place build aux files +# - inctests true if --with-tests was given, blank otherwise # - avoidlist list of modules to avoid, from --avoid # - lgpl true if library's license shall be LGPL, blank otherwise # - libtool true if libtool will be used, blank otherwise # - guessed_libtool true if the configure.ac file uses libtool, blank otherwise # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use -# - dry_run true if actions shall only be printed, blank otherwise +# - 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 func_import () { @@ -788,10 +943,13 @@ func_import () cached_avoidlist= cached_sourcebase= cached_m4base= + cached_docbase= + cached_testsbase= cached_libname= cached_lgpl= cached_libtool= cached_macro_prefix= + cached_autoconf_minversion= cached_files= if test -f "$destdir"/$m4base/gnulib-cache.m4; then my_sed_traces=' @@ -810,6 +968,12 @@ func_import () /gl_M4_BASE(/ { s,^.*gl_M4_BASE([[ ]*\([^])]*\).*$,cached_m4base="\1",p } + /gl_DOC_BASE(/ { + s,^.*gl_DOC_BASE([[ ]*\([^])]*\).*$,cached_docbase="\1",p + } + /gl_TESTS_BASE(/ { + s,^.*gl_TESTS_BASE([[ ]*\([^])]*\).*$,cached_testsbase="\1",p + } /gl_LIB(/ { s,^.*gl_LIB([[ ]*\([^])]*\).*$,cached_libname="\1",p } @@ -821,6 +985,9 @@ func_import () } /gl_MACRO_PREFIX(/ { s,^.*gl_MACRO_PREFIX([[ ]*\([^])]*\).*$,cached_macro_prefix="\1",p + } + /gl_AUTOCONF_MINVERSION(/ { + s,^.*gl_AUTOCONF_MINVERSION([[ ]*\([^])]*\).*$,cached_autoconf_minversion="\1",p }' eval `sed -n -e "$my_sed_traces" < "$destdir"/$m4base/gnulib-cache.m4` if test -f "$destdir"/$m4base/gnulib-comp.m4; then @@ -863,6 +1030,20 @@ func_import () func_fatal_error "missing --source-base option" fi fi + # The docbase defaults to the cached one. + if test -z "$docbase"; then + docbase="$cached_docbase" + if test -z "$docbase"; then + func_fatal_error "missing --doc-base option. --doc-base has been introduced on 2006-07-11; if your last invocation of 'gnulib-tool --update' is before that date, you need to run 'gnulib-tool --update' once, with a --doc-base option." + fi + fi + # The testsbase defaults to the cached one. + if test -z "$testsbase"; then + testsbase="$cached_testsbase" + if test -z "$testsbase"; then + func_fatal_error "missing --tests-base option" + fi + fi # The libname defaults to the cached one. if test -z "$supplied_libname"; then libname="$cached_libname" @@ -889,9 +1070,16 @@ func_import () func_fatal_error "missing --macro-prefix option" fi fi + # The autoconf_minversion defaults to the cached one. + if test -z "$autoconf_minversion"; then + autoconf_minversion="$cached_autoconf_minversion" + if test -z "$autoconf_minversion"; then + autoconf_minversion="$DEFAULT_AUTOCONF_MINVERSION" + fi + fi # Canonicalize the list of specified modules. - specified_modules=`for m in $specified_modules; do echo $m; done | sort | uniq` + specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort | LC_ALL=C uniq` # Determine final module list. modules="$specified_modules" @@ -899,12 +1087,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 @@ -926,22 +1117,80 @@ func_import () fi # Create directories. - test -d "$destdir/$sourcebase" \ - || { test -n "$dry_run" || mkdir "$destdir/$sourcebase" || func_fatal_error "failed"; } - test -d "$destdir/$m4base" \ - || { test -n "$dry_run" || mkdir "$destdir/$m4base" || func_fatal_error "failed"; } - test -d "$destdir/$auxdir" \ - || { test -n "$dry_run" || mkdir "$destdir/$auxdir" || func_fatal_error "failed"; } + 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" + 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" + 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" + 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 - # 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/,"` ;; + 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" @@ -949,93 +1198,113 @@ func_import () 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 # 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 - echo "Removing file $g (backup in ${g}~)" - test -n "$dry_run" && dry=echo - $dry mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed" + if $doit; then + echo "Removing file $g (backup in ${g}~)" + mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed" + else + echo "Remove file $g (backup in ${g}~)" + fi fi done # func_add_or_update handles a file that ought to be present afterwards. # 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. - if test -n "$already_present"; then - echo "Updating file $g (backup in ${g}~)" - else - echo "Replacing file $g (non-gnulib code backuped in ${g}~) !!" - fi - test -n "$dry_run" && dry=echo - $dry mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed" - if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$destdir/$g.tmp" > /dev/null; then - func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g" + if $doit; then + if test -n "$already_present"; then + echo "Updating file $g (backup in ${g}~)" + else + 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" "$tmpfile" > /dev/null; then + func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g" + else + mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" + fi else - $dry mv -f "$destdir/$g.tmp" "$destdir/${g}" || func_fatal_error "failed" + if test -n "$already_present"; then + echo "Update file $g (backup in ${g}~)" + else + echo "Replace file $g (non-gnulib code backuped in ${g}~) !!" + fi fi fi else # Install the file. # Don't protest if the file should be there but isn't: it happens # frequently that developers don't put autogenerated files into CVS. - echo "Copying file $g" - test -n "$dry_run" && dry=echo - if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$destdir/$g.tmp" > /dev/null; then - func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g" + if $doit; then + echo "Copying file $g" + if test -n "$symbolic" && cmp "$gnulib_dir/$f" "$tmpfile" > /dev/null; then + func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g" + else + mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" + fi else - $dry mv -f "$destdir/$g.tmp" "$destdir/${g}" || func_fatal_error "failed" + 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/,"` ;; + 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 # 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/,"` ;; + 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 - 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" @@ -1043,6 +1312,7 @@ func_import () 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" @@ -1054,44 +1324,39 @@ func_import () actioncmd="$actioncmd --libtool" fi actioncmd="$actioncmd --macro-prefix=$macro_prefix" + actioncmd="$actioncmd --assume-autoconf=$autoconf_minversion" actioncmd="$actioncmd `echo $specified_modules`" # Create lib/Makefile.am. - if test -z "$dry_run"; then - func_emit_lib_Makefile_am > "$destdir"/$sourcebase/Makefile.am.tmp - 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 - else + 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 "$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 "$tmpfile" fi - else - echo "Creating $sourcebase/Makefile.am" - mv -f "$destdir"/$sourcebase/Makefile.am.tmp "$destdir"/$sourcebase/Makefile.am fi else - echo "Creating $sourcebase/Makefile.am..." - func_emit_lib_Makefile_am + if $doit; then + echo "Creating $sourcebase/Makefile.am" + mv -f "$tmpfile" "$destdir"/$sourcebase/Makefile.am + else + echo "Create $sourcebase/Makefile.am" + rm -f "$tmpfile" + fi fi # Create m4/gnulib-cache.m4. + func_dest_tmpfilename $m4base/gnulib-cache.m4 ( - if test -z "$dry_run"; then - exec > "$destdir"/$m4base/gnulib-cache.m4.tmp - else - echo "Creating $m4base/gnulib-cache.m4..." - echo "# $destdir/$m4base/gnulib-cache.m4" - fi - 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." @@ -1107,44 +1372,47 @@ func_import () echo "gl_AVOID([$avoidlist])" echo "gl_SOURCE_BASE([$sourcebase])" echo "gl_M4_BASE([$m4base])" + echo "gl_DOC_BASE([$docbase])" + echo "gl_TESTS_BASE([$testsbase])" echo "gl_LIB([$libname])" test -z "$lgpl" || echo "gl_LGPL" test -z "$libtool" || echo "gl_LIBTOOL" echo "gl_MACRO_PREFIX([$macro_prefix])" - echo - echo "# gnulib-cache.m4 ends here" - ) - if test -z "$dry_run"; then - 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 - else + echo "gl_AUTOCONF_MINVERSION([$autoconf_minversion])" + ) > "$tmpfile" + if test -f "$destdir"/$m4base/gnulib-cache.m4; then + 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 "$tmpfile" + echo + echo "# gnulib-cache.m4 ends here" + fi + rm -f "$tmpfile" fi - else + 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 "$tmpfile" + rm -f "$tmpfile" fi fi # Create m4/gnulib-comp.m4. + func_dest_tmpfilename $m4base/gnulib-comp.m4 ( - if test -z "$dry_run"; then - exec > "$destdir"/$m4base/gnulib-comp.m4.tmp - else - echo "Creating $m4base/gnulib-comp.m4..." - echo "# $destdir/$m4base/gnulib-comp.m4" - fi - 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" @@ -1157,22 +1425,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/'"'"'`' @@ -1188,36 +1479,114 @@ func_import () echo "AC_DEFUN([${macro_prefix}_FILE_LIST], [" echo "$files" | sed -e 's,^, ,' echo "])" - echo - echo "# gnulib-comp.m4 ends here" - ) - if test -z "$dry_run"; then - 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 - else + ) > "$tmpfile" + if test -f "$destdir"/$m4base/gnulib-comp.m4; then + 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 "$tmpfile" + echo + echo "# gnulib-comp.m4 ends here" + fi + rm -f "$tmpfile" fi - else + 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 "$tmpfile" + rm -f "$tmpfile" fi fi + if test -n "$inctests"; then + # Create tests/Makefile.am. + 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 "$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 "$tmpfile" "$destdir"/$testsbase/Makefile.am + else + echo "Update $testsbase/Makefile.am (backup in $testsbase/Makefile.am~)" + rm -f "$tmpfile" + fi + fi + else + if $doit; then + echo "Creating $testsbase/Makefile.am" + mv -f "$tmpfile" "$destdir"/$testsbase/Makefile.am + else + echo "Create $testsbase/Makefile.am" + 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," + if test -n "$inctests"; then + echo " - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in $configure_ac," + fi sourcebase_dir=`echo "$sourcebase" | sed -n -e 's,/[^/]*$,/,p'` sourcebase_base=`basename "$sourcebase"` echo " - mention \"${sourcebase_base}\" in SUBDIRS in ${sourcebase_dir}Makefile.am," + if test -n "$inctests"; then + testsbase_dir=`echo "$testsbase" | sed -n -e 's,/[^/]*$,/,p'` + testsbase_base=`basename "$testsbase"` + echo " - mention \"${testsbase_base}\" in SUBDIRS in ${testsbase_dir}Makefile.am," + fi echo " - mention \"-I ${m4base}\" in ACLOCAL_AMFLAGS in Makefile.am," echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after AC_PROG_CC," echo " - invoke ${macro_prefix}_INIT in $configure_ac." @@ -1230,13 +1599,16 @@ func_create_testdir () { testdir="$1" modules="$2" - modules=`for m in $modules; do echo $m; done | sort | uniq` + modules=`for m in $modules; do echo $m; done | LC_ALL=C sort | LC_ALL=C uniq` # Determine final module list. func_modules_transitive_closure 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:" @@ -1298,6 +1670,8 @@ func_create_testdir () test -d "$testdir/tests" || mkdir "$testdir/tests" # Create tests/Makefile.am. sourcebase=lib + m4base=m4 + testsbase=tests func_emit_tests_Makefile_am > "$testdir/tests/Makefile.am" # Create tests/configure.ac. (echo "# Process this file with autoconf to produce a configure script." @@ -1312,27 +1686,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 @@ -1371,18 +1767,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 @@ -1410,10 +1827,8 @@ func_create_testdir () (cd "$testdir" ./configure cd lib - built_sources=`grep '^BUILT_SOURCES *=' Makefile.in | sed -e 's/^BUILT_SOURCES *=//'` - if test -n "$built_sources"; then - make $built_sources - fi + echo 'built_sources: $(BUILT_SOURCES)' >> Makefile + make built_sources cd .. make distclean ) @@ -1467,8 +1882,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 ) } @@ -1480,7 +1904,8 @@ case $mode in func_all_modules ;; - import ) + import | update ) + # Where to import. if test -z "$destdir"; then destdir=. @@ -1529,7 +1954,10 @@ case $mode in # First use of gnulib in the given m4base. test -n "$supplied_libname" || supplied_libname=true test -n "$sourcebase" || sourcebase="lib" + test -n "$docbase" || docbase="doc" + test -n "$testsbase" || testsbase="tests" test -n "$macro_prefix" || macro_prefix="gl" + test -n "$autoconf_minversion" || autoconf_minversion="$DEFAULT_AUTOCONF_MINVERSION" fi func_import "$*" else @@ -1537,7 +1965,7 @@ case $mode in # To get this list of directories, look at Makefile.am. (Not at # configure, because it may be omitted from CVS. Also, don't run # "find $destdir -name gnulib-cache.m4", as it might be too expensive.) - aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ ]*=' "$destdir"/Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/'` + aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ ]*=' "$destdir"/Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/'` m4dirs= m4dirs_count=0 m4dir_is_next= @@ -1567,7 +1995,10 @@ case $mode in test -n "$supplied_libname" || supplied_libname=true test -n "$sourcebase" || sourcebase="lib" m4base="m4" + test -n "$docbase" || docbase="doc" + test -n "$testsbase" || testsbase="tests" test -n "$macro_prefix" || macro_prefix="gl" + test -n "$autoconf_version" || autoconf_version="$DEFAULT_AUTOCONF_MINVERSION" func_import "$*" else if test $m4dirs_count = 1; then