X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=1cdb902dd32c72f7cf6033cfd1a093a08dbe02a2;hb=e323f261972032e4a1eeee6102c2327e97c808df;hp=f4f6ad3a310b6515ea12165a4849a770842a78a8;hpb=9ba0cff43d74ebd547a5606b247dc9f930e4bd79;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index f4f6ad3a3..1cdb902dd 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -2,10 +2,10 @@ # # Copyright (C) 2002-2007 Free Software Foundation, Inc. # -# This program is free software; you can redistribute it and/or modify +# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -13,8 +13,7 @@ # 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, see . # # This program is meant for authors or maintainers which want to import @@ -22,9 +21,11 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2007-09-16 00:41:34 $' +cvsdatestamp='$Date: 2007-09-17 10:26:33 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` +# Sometimes last_checkin_date is "YYYY/MM/DD ...", sometimes "YYYY-MM-DD ...". version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` +# version is in YYYY-MM-DD format. nl=' ' IFS=" "" $nl" @@ -168,8 +169,10 @@ Options for --import: --avoid=MODULE Avoid including the given MODULE. Useful if you have code that provides equivalent functionality. This option can be repeated. - --lgpl Abort if modules aren't available under the LGPL. + --lgpl[=2|=3] Abort if modules aren't available under the LGPL. Also modify license template from GPL to LGPL. + The version number of the LGPL can be specified; + the default is currently LGPLv3. --makefile-name=NAME Name of makefile in automake syntax in the source-base and tests-base directories (default \"Makefile.am\"). @@ -196,7 +199,7 @@ Report bugs to ." # outputs to stdout the --version message. func_version () { - year=`echo "$last_checkin_date" | sed -e 's,/.*$,,'` + year=`echo "$version" | sed -e 's,-.*$,,'` echo "\ $progname (GNU $package) $version Copyright (C) $year Free Software Foundation, Inc. @@ -593,7 +596,7 @@ fi # - 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 +# - lgpl yes or a number if --lgpl was given, blank otherwise # - makefile_name from --makefile-name # - libtool true if --libtool was given, false if --no-libtool was # given, blank otherwise @@ -773,7 +776,15 @@ fi func_append avoidlist " $arg" shift ;; --lgpl ) - lgpl=true + lgpl=yes + shift ;; + --lgpl=* ) + arg=`echo "X$1" | sed -e 's/^X--lgpl=//'` + case "$arg" in + 2 | 3) ;; + *) func_fatal_error "invalid LGPL version number for --lgpl" ;; + esac + lgpl=$arg shift ;; --makefile-name ) shift @@ -1211,7 +1222,7 @@ func_get_filelist () func_get_dependencies () { # ${module}-tests always implicitly depends on ${module}. - echo "$1" | sed -n -e 's/-tests//p' + echo "$1" | sed -n -e 's/-tests$//p' # Then the explicit dependencies listed in the module description. func_lookup_file "modules/$1" sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file" @@ -1245,6 +1256,18 @@ func_get_automake_snippet () case "$1" in *-tests) # *-tests module live in tests/, not lib/. + # Synthesize an EXTRA_DIST augmentation. + all_files=`func_get_filelist $1` + tests_files=`for f in $all_files; do \ + case $f in \ + tests/*) echo $f ;; \ + esac; \ + done | sed -e 's,^tests/,,'` + extra_files="$tests_files" + if test -n "$extra_files"; then + echo "EXTRA_DIST +=" $extra_files + echo + fi ;; *) # Synthesize an EXTRA_DIST augmentation. @@ -1770,21 +1793,21 @@ func_emit_po_POTFILES_in () # - 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 # - sourcebase relative directory containing lib source code # - m4base relative directory containing autoconf macros # - testsbase relative directory containing unit test code +# - macro_prefix prefix of gl_LIBOBJS macros to use # - for_test true if creating a package for testing, false otherwise +# - use_libtests true if a libtests.a should be built, false otherwise +# Output: +# - uses_subdirs nonempty if object files in subdirs exist func_emit_tests_Makefile_am () { if test "$libtool" = true; then libext=la - else - libext=a - fi - if test "$libtool" = true; then - libext=la sed_eliminate_LDFLAGS= else libext=a @@ -1804,24 +1827,28 @@ func_emit_tests_Makefile_am () echo "## Process this file with automake to produce Makefile.in." 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 + uses_subdirs= ( for module in $modules; do - func_verify_tests_module + if $for_test; then + func_verify_tests_module + else + func_verify_module + fi 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' \ -e "$sed_eliminate_LDFLAGS" \ - -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \ + -e 's,lib_\([A-Z][A-Z]*\),libtests_a_\1,g' \ -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \ -e "$sed_transform_check_PROGRAMS" + if $use_libtests && test "$module" = 'alloca'; then + echo "libtests_a_LIBADD += @${perhapsLT}ALLOCA@" + echo "libtests_a_DEPENDENCIES += @${perhapsLT}ALLOCA@" + fi } > amsnippet.tmp # Skip the contents if its entirely empty. if grep '[^ ]' amsnippet.tmp > /dev/null ; then @@ -1832,9 +1859,28 @@ func_emit_tests_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 | tests/*/*.c) uses_subdirs=yes ;; + esac + done fi done ) > allsnippets.tmp + # Generate dependencies here, since it eases the debugging of test failures. + # If there are source files in subdirectories, prevent collision of the + # object files (example: hash.c and libxml/hash.c). + subdir_options= + if test -n "$uses_subdirs"; then + subdir_options=' subdir-objects' + fi + echo "AUTOMAKE_OPTIONS = 1.5 foreign${subdir_options}" + echo + if $for_test; then + echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}" + echo + fi # Nothing is being added to SUBDIRS; nevertheless the existence of this # variable is needed to avoid an error from automake: # "AM_GNU_GETTEXT used but SUBDIRS not defined" @@ -1846,6 +1892,16 @@ func_emit_tests_Makefile_am () echo "check_PROGRAMS =" fi echo "noinst_HEADERS =" + echo "noinst_LIBRARIES =" + if $use_libtests; then + if $for_test; then + echo "noinst_LIBRARIES += libtests.a" + else + echo "check_LIBRARIES = libtests.a" + fi + fi + # Automake versions < 1.9b create an empty pkgdatadir at installation time + # if you specify pkgdata_DATA to empty. This is a workaround. if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then echo "pkgdata_DATA =" fi @@ -1863,9 +1919,28 @@ func_emit_tests_Makefile_am () echo " -I${testsbase_inverse} -I\$(srcdir)/${testsbase_inverse} \\" echo " -I${testsbase_inverse}/${sourcebase-lib} -I\$(srcdir)/${testsbase_inverse}/${sourcebase-lib}" echo - echo "LDADD = ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}" + local_ldadd='' + if $use_libtests; then + local_ldadd=' libtests.a $(LIBTESTS_LIBDEPS)' + fi + # local_ldadd must be listed first, since it often depends on non-test + # modules; it must also be listed last, since it can include modules + # such as progname that satisfy dependencies of non-test modules. + echo "LDADD =${local_ldadd} ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}${local_ldadd}" echo - cat allsnippets.tmp + if $use_libtests; then + echo "libtests_a_SOURCES =" + # Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However, + # automake during its analyses looks for $(LIBOBJS), not for @LIBOBJS@. + echo "libtests_a_LIBADD = \$(${macro_prefix}tests_LIBOBJS)" + echo "libtests_a_DEPENDENCIES = \$(${macro_prefix}tests_LIBOBJS)" + echo "EXTRA_libtests_a_SOURCES =" + # The circular dependency in LDADD requires this. + echo "AM_LIBTOOLFLAGS = --preserve-dup-deps" + echo + fi + cat allsnippets.tmp \ + | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' echo "# Clean up after Solaris cc." echo "clean-local:" echo " rm -rf SunWS_cache" @@ -1880,73 +1955,98 @@ func_emit_tests_Makefile_am () rm -f allsnippets.tmp } -# func_emit_initmacro_start +# func_emit_initmacro_start macro_prefix # 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 () { + macro_prefix_arg="$1" # Overriding AC_LIBOBJ and AC_REPLACE_FUNCS has the effect of storing - # platform-dependent object files in ${macro_prefix}_LIBOBJS instead of + # platform-dependent object files in ${macro_prefix_arg}_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]))" + echo " m4_pushdef([AC_LIBOBJ], m4_defn([${macro_prefix_arg}_LIBOBJ]))" + echo " m4_pushdef([AC_REPLACE_FUNCS], m4_defn([${macro_prefix_arg}_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]))" + echo " m4_pushdef([AC_LIBSOURCES], m4_defn([${macro_prefix_arg}_LIBSOURCES]))" } -# func_emit_initmacro_end +# func_emit_initmacro_end macro_prefix # 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 () { + macro_prefix_arg="$1" 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 " ${macro_prefix_arg}_libobjs=" + echo " ${macro_prefix_arg}_ltlibobjs=" + echo " if test -n \"\$${macro_prefix_arg}_LIBOBJS\"; then" echo " # Remove the extension." echo " sed_drop_objext='s/\\.o\$//;s/\\.obj\$//'" - echo " for i in \`for i in \$${macro_prefix}_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 " for i in \`for i in \$${macro_prefix_arg}_LIBOBJS; do echo \"\$i\"; done | sed \"\$sed_drop_objext\" | sort | uniq\`; do" + echo " ${macro_prefix_arg}_libobjs=\"\$${macro_prefix_arg}_libobjs \$i.\$ac_objext\"" + echo " ${macro_prefix_arg}_ltlibobjs=\"\$${macro_prefix_arg}_ltlibobjs \$i.lo\"" echo " done" echo " fi" - echo " AC_SUBST([${macro_prefix}_LIBOBJS], [\$${macro_prefix}_libobjs])" - echo " AC_SUBST([${macro_prefix}_LTLIBOBJS], [\$${macro_prefix}_ltlibobjs])" + echo " AC_SUBST([${macro_prefix_arg}_LIBOBJS], [\$${macro_prefix_arg}_libobjs])" + echo " AC_SUBST([${macro_prefix_arg}_LTLIBOBJS], [\$${macro_prefix_arg}_ltlibobjs])" echo " ])" } -# func_emit_initmacro_done +# func_emit_initmacro_done macro_prefix sourcebase # emits a few statements after the gl_INIT macro to standard output. # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use +# - sourcebase directory relative to destdir where to place source code func_emit_initmacro_done () { + macro_prefix_arg="$1" + sourcebase_arg="$2" 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 "# into ${macro_prefix_arg}_LIBOBJS instead of into LIBOBJS." + echo "AC_DEFUN([${macro_prefix_arg}_LIBOBJ], [" + echo " AS_LITERAL_IF([\$1], [${macro_prefix_arg}_LIBSOURCES([\$1.c])])dnl" + echo " ${macro_prefix_arg}_LIBOBJS=\"\$${macro_prefix_arg}_LIBOBJS \$1.\$ac_objext\"" + echo "])" + echo + echo "# m4_foreach_w is provided by autoconf-2.59c and later." + echo "# This definition is to accommodate developers using versions" + echo "# of autoconf older than that." + echo "m4_ifndef([m4_foreach_w]," + echo " [m4_define([m4_foreach_w]," + echo " [m4_foreach([\$1], m4_split(m4_normalize([\$2]), [ ]), [\$3])])])" 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 "# into ${macro_prefix_arg}_LIBOBJS instead of into LIBOBJS." + echo "AC_DEFUN([${macro_prefix_arg}_REPLACE_FUNCS], [" + echo " m4_foreach_w([gl_NAME], [\$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl" + echo " AC_CHECK_FUNCS([\$1], , [${macro_prefix_arg}_LIBOBJ(\$ac_func)])" + echo "])" 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 " [])" + echo "# Like AC_LIBSOURCES, except the directory where the source file is" + echo "# expected is derived from the gnulib-tool parametrization," + echo "# and alloca is special cased (for the alloca-opt module)." + echo "# We could also entirely rely on EXTRA_lib..._SOURCES." + echo "AC_DEFUN([${macro_prefix_arg}_LIBSOURCES], [" + echo " m4_foreach([_gl_NAME], [\$1], [" + echo " m4_if(_gl_NAME, [alloca.c], [], [" + echo " m4_syscmd([test -r $sourcebase_arg/]_gl_NAME[ || test ! -d $sourcebase_arg])dnl" + echo " m4_if(m4_sysval, [0], []," + echo " [AC_FATAL([missing $sourcebase_arg/]_gl_NAME)])" + echo " ])" + echo " ])" + echo "])" } # func_import modules @@ -1963,7 +2063,8 @@ func_emit_initmacro_done () # - 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 +# - lgpl yes or a number if library's license shall be LGPL, +# blank otherwise # - makefile_name from --makefile-name # - libtool true if --libtool was given, false if --no-libtool was # given, blank otherwise @@ -2032,8 +2133,11 @@ func_import () /gl_LIB(/ { s,^.*gl_LIB([[ ]*\([^])]*\).*$,cached_libname="\1",p } + /gl_LGPL(/ { + s,^.*gl_LGPL([[ ]*\([^])]*\).*$,cached_lgpl="\1",p + } /gl_LGPL/ { - s,^.*$,cached_lgpl=true,p + s,^.*$,cached_lgpl=yes,p } /gl_MAKEFILE_NAME(/ { s,^.*gl_MAKEFILE_NAME([[ ]*\([^])]*\).*$,cached_makefile_name="\1",p @@ -2175,28 +2279,100 @@ func_import () echo "Module list with included dependencies:" echo "$modules" | sed -e 's/^/ /' fi + final_modules="$modules" + + # Determine main module list and tests-related module list separately. + # The main module list is the transitive closure of the specified modules, + # ignoring tests modules. Its lib/* sources go into $sourcebase/. If --lgpl + # is specified, it will consist only of LGPLed source. + # The tests-related module list is the transitive closure of the specified + # modules, including tests modules, minus the main module list. Its lib/* + # sources (brought in through dependencies of *-tests modules) go into + # $testsbase/. It may contain GPLed source, even if --lgpl is specified. + # Determine main module list. + saved_inctests="$inctests" + inctests="" + modules="$specified_modules" + func_modules_transitive_closure + main_modules="$modules" + inctests="$saved_inctests" + if test $verbose -ge 1; then + echo "Main module list:" + echo "$main_modules" | sed -e 's/^/ /' + fi + # Determine tests-related module list. + echo "$final_modules" | LC_ALL=C sort -u > "$tmp"/final-modules + testsrelated_modules=`echo "$main_modules" | LC_ALL=C sort -u | LC_ALL=C join -v 2 - "$tmp"/final-modules` + if test $verbose -ge 1; then + echo "Tests-related module list:" + echo "$testsrelated_modules" | sed -e 's/^/ /' + fi - # Add the dummy module if needed. + # Add the dummy module to the main module list if needed. + modules="$main_modules" func_modules_add_dummy + main_modules="$modules" + + # Determine whether a $testsbase/libtests.a is needed. + use_libtests=false + for module in $testsrelated_modules; do + func_verify_nontests_module + if test -n "$module"; then + all_files=`func_get_filelist $module` + lib_files=`for f in $all_files; do \ + case $f in \ + lib/*) echo $f ;; \ + esac; \ + done | sed -e 's,^lib/,,'` + if test -n "$lib_files"; then + use_libtests=true + break + fi + fi + done + + # Add the dummy module to the tests-related module list if needed. + if $use_libtests; then + modules="$testsrelated_modules" + func_modules_add_dummy + testsrelated_modules="$modules" + fi # If --lgpl, verify that the licenses of modules are compatible. if test -n "$lgpl"; then - for module in $modules; do + for module in $main_modules; do license=`func_get_license $module` case $license in - LGPL | LGPLv2+ | 'GPLed build tool') ;; + 'GPLed build tool') ;; 'public domain' | 'unlimited' | 'unmodifiable license text') ;; - *) func_fatal_error "incompatible license on module $module: $license" ;; + *) + case "$lgpl" in + yes | 3) + case $license in + LGPL | LGPLv2+) ;; + *) func_fatal_error "incompatible license on module $module: $license" ;; + esac + ;; + 2) + case $license in + LGPLv2+) ;; + *) func_fatal_error "incompatible license on module $module: $license" ;; + esac + ;; + *) func_fatal_error "invalid value lgpl=$lgpl" ;; + esac + ;; esac done fi # Show banner notice of every module. + modules="$main_modules" func_modules_notice # Determine script to apply to imported library files. sed_transform_lib_file= - for module in $modules; do + for module in $main_modules; do if test $module = config-h; then # Assume config.h exists, and that -DHAVE_CONFIG_H is omitted. sed_transform_lib_file=$sed_transform_lib_file' @@ -2205,21 +2381,65 @@ func_import () break fi done + sed_transform_main_lib_file="$sed_transform_lib_file" if test -n "$do_copyrights"; then if test -n "$lgpl"; then # Update license. - sed_transform_lib_file=$sed_transform_lib_file' - s/GNU General/GNU Lesser General/g - s/version 2\([ ,]\)/version 2.1\1/g + case "$lgpl" in + yes | 3) + sed_transform_main_lib_file=$sed_transform_main_lib_file' + s/GNU General/GNU Lesser General/g + ' + ;; + 2) + sed_transform_main_lib_file=$sed_transform_main_lib_file' + s/GNU General/GNU Lesser General/g + s/version [23]\([ ,]\)/version 2.1\1/g + ' + ;; + *) func_fatal_error "invalid value lgpl=$lgpl" ;; + esac + else + # Update license. + sed_transform_main_lib_file=$sed_transform_main_lib_file' + s/GNU Lesser General/GNU General/g + s/GNU Library General/GNU General/g + s/version \(2\|2\.1\)\([ ,]\)/version 3\2/g ' fi fi - # Determine final file list. + # Determine script to apply to library files that go into $testsbase/. + sed_transform_testsrelated_lib_file="$sed_transform_lib_file" + if test -n "$do_copyrights"; then + # Update license. + sed_transform_testsrelated_lib_file=$sed_transform_testsrelated_lib_file' + s/GNU Lesser General/GNU General/g + s/GNU Library General/GNU General/g + s/version \(2\|2\.1\)\([ ,]\)/version 3\2/g + ' + fi + + # Determine the final file lists. + # They must be computed separately, because files in lib/* go into + # $sourcebase/ if they are in the main file list but into $testsbase/ + # if they are in the tests-related file list. Furthermore lib/dummy.c + # can be in both. + # Determine final main file list. + modules="$main_modules" + func_modules_to_filelist + main_files="$files" + # Determine final tests-related file list. + modules="$testsrelated_modules" func_modules_to_filelist + testsrelated_files=`echo "$files" | sed -e 's,^lib/,tests=lib/,'` + # Merge both file lists. + sed_remove_empty_lines='/^$/d' + files=`{ echo "$main_files"; echo "$testsrelated_files"; } | sed -e "$sed_remove_empty_lines" | LC_ALL=C sort -u` if test $verbose -ge 0; then echo "File list:" - echo "$files" | sed -e 's/^/ /' + sed_prettyprint_files='s,^tests=lib/\(.*\)$,lib/\1 -> tests/\1,' + echo "$files" | sed -e "$sed_prettyprint_files" -e 's/^/ /' fi test -n "$files" \ @@ -2237,13 +2457,15 @@ func_import () s,^doc/,$cached_docbase/, s,^lib/,$cached_sourcebase/, s,^m4/,$cached_m4base/, - s,^tests/,$cached_testsbase/," + s,^tests/,$cached_testsbase/, + s,^tests=lib/,$cached_testsbase/," sed_rewrite_new_files="\ s,^build-aux/,$auxdir/, s,^doc/,$docbase/, s,^lib/,$sourcebase/, s,^m4/,$m4base/, - s,^tests/,$testsbase/," + s,^tests/,$testsbase/, + s,^tests=lib/,$testsbase/," # Create directories. { echo "$sourcebase" @@ -2334,13 +2556,25 @@ func_import () # - already_present nonempty if the file already exists, empty otherwise func_add_or_update () { + of="$f" + case "$f" in + tests=lib/*) f=`echo "$f" | sed -e 's,^tests=lib/,lib/,'` ;; + esac func_dest_tmpfilename "$g" func_lookup_file "$f" cp "$lookedup_file" "$tmpfile" || func_fatal_error "failed" - if test -n "$sed_transform_lib_file"; then - case "$f" in + if test -n "$sed_transform_main_lib_file"; then + case "$of" in lib/*) - sed -e "$sed_transform_lib_file" \ + sed -e "$sed_transform_main_lib_file" \ + < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" + ;; + esac + fi + if test -n "$sed_transform_testsrelated_lib_file"; then + case "$of" in + tests=lib/*) + sed -e "$sed_transform_testsrelated_lib_file" \ < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" ;; esac @@ -2446,7 +2680,11 @@ func_import () func_append actioncmd " --avoid=$module" done if test -n "$lgpl"; then - func_append actioncmd " --lgpl" + if test "$lgpl" = yes; then + func_append actioncmd " --lgpl" + else + func_append actioncmd " --lgpl=$lgpl" + fi fi if test -n "$makefile_name"; then func_append actioncmd " --makefile-name=$makefile_name" @@ -2474,6 +2712,7 @@ func_import () # Create library makefile. func_dest_tmpfilename $sourcebase/$makefile_am + modules="$main_modules" func_emit_lib_Makefile_am > "$tmpfile" if test -f "$destdir"/$sourcebase/$makefile_am; then if cmp "$destdir"/$sourcebase/$makefile_am "$tmpfile" > /dev/null; then @@ -2668,7 +2907,13 @@ func_import () echo "gl_TESTS_BASE([$testsbase])" test -z "$inctests" || echo "gl_WITH_TESTS" echo "gl_LIB([$libname])" - test -z "$lgpl" || echo "gl_LGPL" + if test -n "$lgpl"; then + if test "$lgpl" = yes; then + echo "gl_LGPL" + else + echo "gl_LGPL([$lgpl])" + fi + fi echo "gl_MAKEFILE_NAME([$makefile_name])" if test "$libtool" = true; then echo "gl_LIBTOOL" @@ -2733,7 +2978,7 @@ func_import () if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then echo " AC_REQUIRE([AC_GNU_SOURCE])" fi - for module in $modules; do + for module in $final_modules; do func_verify_module if test -n "$module"; then func_get_autoconf_early_snippet "$module" @@ -2746,7 +2991,6 @@ func_import () 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" @@ -2756,7 +3000,6 @@ 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 @@ -2767,7 +3010,9 @@ func_import () else sed_replace_build_aux= fi - for module in $modules; do + func_emit_initmacro_start $macro_prefix + echo " gl_source_base='$sourcebase'" + for module in $main_modules; do func_verify_module if test -n "$module"; then func_get_autoconf_snippet "$module" \ @@ -2782,6 +3027,24 @@ func_import () fi fi done + func_emit_initmacro_end $macro_prefix + echo " gltests_libdeps=" + echo " gltests_ltlibdeps=" + func_emit_initmacro_start ${macro_prefix}tests + echo " gl_source_base='$testsbase'" + for module in $testsrelated_modules; do + func_verify_module + if test -n "$module"; then + func_get_autoconf_snippet "$module" \ + | sed -e '/^$/d;' -e 's/^/ /' \ + -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./' \ + -e "$sed_replace_build_aux" \ + -e 's/\$gl_cond_libtool/false/g' \ + -e 's/gl_libdeps/gltests_libdeps/g' \ + -e 's/gl_ltlibdeps/gltests_ltlibdeps/g' + fi + done + func_emit_initmacro_end ${macro_prefix}tests # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. if test "$libtool" != true; then @@ -2791,9 +3054,13 @@ func_import () echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" fi - func_emit_initmacro_end + if $use_libtests; then + echo " LIBTESTS_LIBDEPS=\"\$gltests_libdeps\"" + echo " AC_SUBST([LIBTESTS_LIBDEPS])" + fi echo "])" - func_emit_initmacro_done + func_emit_initmacro_done $macro_prefix $sourcebase + func_emit_initmacro_done ${macro_prefix}tests $testsbase 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." @@ -2833,6 +3100,7 @@ func_import () if test -n "$inctests"; then # Create tests makefile. func_dest_tmpfilename $testsbase/$makefile_am + modules="$testsrelated_modules" func_emit_tests_Makefile_am > "$tmpfile" if test -f "$destdir"/$testsbase/$makefile_am; then if cmp "$destdir"/$testsbase/$makefile_am "$tmpfile" > /dev/null; then @@ -2945,13 +3213,13 @@ func_import () 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). + # Intersect $specified_modules and $main_modules + # (since $specified_modules is not necessarily of subset of $main_modules + # - some may have been skipped through --avoid, and since the elements of + # $main_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 + echo "$main_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. @@ -2974,7 +3242,7 @@ func_import () ) | sed -e '/^$/d' -e 's/^/ /' rm -f "$tmp"/include-angles "$tmp"/include-quotes "$tmp"/include-if - for module in $modules; do + for module in $main_modules; do func_get_link_directive "$module" done \ | LC_ALL=C sort -u | sed -e '/^$/d' -e 's/^/ /' > "$tmp"/link @@ -3179,6 +3447,7 @@ func_create_testdir () # Create $sourcebase/Makefile.am. mkdir -p "$testdir/$sourcebase" func_emit_lib_Makefile_am > "$testdir/$sourcebase/Makefile.am" + any_uses_subdirs="$uses_subdirs" # Create $m4base/Makefile.am. mkdir -p "$testdir/$m4base" @@ -3208,7 +3477,9 @@ func_create_testdir () if test -n "$inctests"; then test -d "$testdir/$testsbase" || mkdir "$testdir/$testsbase" # Create $testsbase/Makefile.am. + use_libtests=false func_emit_tests_Makefile_am > "$testdir/$testsbase/Makefile.am" + any_uses_subdirs="$any_uses_subdirs$uses_subdirs" # Create $testsbase/configure.ac. (echo "# Process this file with autoconf to produce a configure script." echo "AC_INIT([dummy], [0])" @@ -3250,13 +3521,13 @@ 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 sed_replace_build_aux=' :a /AC_CONFIG_FILES(.*:build-aux\/.*)/{ s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)| ba }' + func_emit_initmacro_start $macro_prefix # We don't have explicit ordering constraints between the various # autoconf snippets. It's cleanest to put those of the library before # those of the tests. @@ -3276,6 +3547,7 @@ func_create_testdir () | sed -e "$sed_replace_build_aux" fi done + func_emit_initmacro_end $macro_prefix # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. if test "$libtool" != true; then @@ -3285,9 +3557,8 @@ func_create_testdir () echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" fi - func_emit_initmacro_end echo "])" - func_emit_initmacro_done + func_emit_initmacro_done $macro_prefix $sourcebase # FIXME use $sourcebase or $testsbase? echo echo "gl_INIT" echo @@ -3336,7 +3607,7 @@ func_create_testdir () echo echo "AC_PROG_RANLIB" echo - if test -n "$uses_subdirs"; then + if test -n "$any_uses_subdirs"; then echo "AM_PROG_CC_C_O" echo fi @@ -3360,7 +3631,6 @@ 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: @@ -3369,7 +3639,6 @@ 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 @@ -3380,6 +3649,8 @@ func_create_testdir () else sed_replace_build_aux= fi + func_emit_initmacro_start $macro_prefix + echo "gl_source_base='$sourcebase'" for module in $modules; do func_verify_nontests_module if test -n "$module"; then @@ -3387,6 +3658,7 @@ func_create_testdir () | sed -e "$sed_replace_build_aux" fi done + func_emit_initmacro_end $macro_prefix # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. if test "$libtool" != true; then @@ -3396,9 +3668,8 @@ func_create_testdir () echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" fi - func_emit_initmacro_end echo "])" - func_emit_initmacro_done + func_emit_initmacro_done $macro_prefix $sourcebase echo echo "gl_INIT" echo @@ -3511,7 +3782,12 @@ func_create_megatestdir () func_append megasubdirs "ALL" # Create autobuild. - cvsdate=`sh "$gnulib_dir/build-aux/mdate-sh" "$gnulib_dir/CVS/Entries" \ + cvsdate=`if test -f "$gnulib_dir/CVS/Entries"; then \ + vc_witness="$gnulib_dir/CVS/Entries"; \ + else \ + vc_witness="$gnulib_dir/.git/refs/heads/master"; \ + fi; \ + sh "$gnulib_dir/build-aux/mdate-sh" "$vc_witness" \ | sed -e 's,January,01,' -e 's,Jan,01,' \ -e 's,February,02,' -e 's,Feb,02,' \ -e 's,March,03,' -e 's,Mar,03,' \