X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=5b44ee09f6178f7b10b90eab119dc1d0d05baec4;hb=0e7a6d56882dc8fd6c8de4a44ee0f103879bbf03;hp=73da2e5075972f1be92911b5a5ecb8552edc4ab3;hpb=d37cfd686992ab379dba0f47c006f863a680334c;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index 73da2e507..5b44ee09f 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2006-07-20 14:51:57 $' +cvsdatestamp='$Date: 2006-09-09 19:02:08 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -53,6 +53,12 @@ if test -z "${AUTORECONF}" || test -n "${AUTOCONFPATH}"; then AUTORECONF="${AUTOCONFPATH}autoreconf" fi +# GNU sort is needed. Set SORT to its location (not needed if it's called +# 'sort' and already in the PATH). +if test -z "$SORT"; then + SORT=sort +fi + # func_usage # outputs to stdout the --help usage message. func_usage () @@ -93,45 +99,53 @@ Operation modes: --extract-filelist extract the list of files --extract-dependencies extract the dependencies --extract-autoconf-snippet extract the snippet for configure.ac - --extract-automake-snippet extract the snippet for lib/Makefile.am + --extract-automake-snippet extract the snippet for library makefile --extract-include-directive extract the #include directive --extract-license report the license terms of the source files under lib/ --extract-maintainer report the maintainer(s) inside gnulib --extract-tests-module report the unit test module, if it exists -Options: - --assume-autoconf=VERSION - Assume a given autoconf version (or newer). +General options: + --dir=DIRECTORY Specify the target directory. + For --import, this specifies where your + configure.ac can be found. Defaults to current + directory. + --local-dir=DIRECTORY Specify a local override directory where to look + up files before looking in gnulib's directory. + +Options for --import: + --lib=LIBRARY Specify the library name. Defaults to 'libgnu'. + --source-base=DIRECTORY + 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 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 have code that provides equivalent functionality. This option can be repeated. - --dry-run For --import, only print what would have been done. --lgpl Abort if modules aren't available under the LGPL. Also modify license template from GPL to LGPL. - --lib=LIBRARY Specify the library name. Defaults to 'libgnu'. - --libtool Use libtool rules, for --import. - --macro-prefix=PREFIX Specify the prefix of the macros gl_EARLY and - gl_INIT. Default is "gl". + --makefile-name=NAME Name of makefile in automake syntax in the + source-base and tests-base directories + (default \"Makefile.am\"). + --libtool Use libtool rules. + --no-libtool Don't 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 - -s, --symbolic, --symlink Make symbolic links instead of copying files. - --with-tests Include unit tests for the included modules. -Directory options: - --dir=DIRECTORY specify the target directory - For --import, this specifies where your - configure.ac can be found. Defaults to current - directory. - --aux-dir=DIRECTORY Directory relative to --dir where auxiliary build - tools are placed (default \"build-aux\"). - --doc-base=DIRECTORY Directory relative to --dir where doc files are - placed (default \"doc\"), for --import. - --m4-base=DIRECTORY Directory relative to --dir where *.m4 macros are - placed (default \"m4\"), for --import. - --source-base=DIRECTORY Directory relative to --dir where source code is - placed (default \"lib\"), for --import. - --tests-base=DIRECTORY Directory relative to --dir where unit tests are - placed (default \"tests\"), for --import. +Options for --import and --update: + --dry-run For --import, only print what would have been done. + -s, --symbolic, --symlink Make symbolic links instead of copying files. Report bugs to ." } @@ -235,10 +249,104 @@ func_ln_if_changed () fi } +# func_relativize DIR1 DIR2 +# computes a relative pathname RELDIR such that DIR1/RELDIR = DIR2. +# Input: +# - DIR1 relative pathname, relative to the current directory +# - DIR2 relative pathname, relative to the current directory +# Output: +# - reldir relative pathname of DIR2, relative to DIR1 +func_relativize () +{ + dir0=`pwd` + dir1="$1" + dir2="$2" + sed_first='s,^\([^/]*\)/.*$,\1,' + sed_rest='s,^[^/]*/*,,' + sed_last='s,^.*/\([^/]*\)$,\1,' + sed_butlast='s,/*[^/]*$,,' + while test -n "$dir1"; do + first=`echo "$dir1" | sed -e "$sed_first"` + if test "$first" != "."; then + if test "$first" = ".."; then + dir2=`echo "$dir0" | sed -e "$sed_last"`/"$dir2" + dir0=`echo "$dir0" | sed -e "$sed_butlast"` + else + first2=`echo "$dir2" | sed -e "$sed_first"` + if test "$first2" = "$first"; then + dir2=`echo "$dir2" | sed -e "$sed_rest"` + else + dir2="../$dir2" + fi + dir0="$dir0"/"$first" + fi + fi + dir1=`echo "$dir1" | sed -e "$sed_rest"` + done + reldir="$dir2" +} + +# func_relconcat DIR1 DIR2 +# computes a relative pathname DIR1/DIR2, with obvious simplifications. +# Input: +# - DIR1 relative pathname, relative to the current directory +# - DIR2 relative pathname, relative to DIR1 +# Output: +# - relconcat DIR1/DIR2, relative to the current directory +func_relconcat () +{ + dir1="$1" + dir2="$2" + sed_first='s,^\([^/]*\)/.*$,\1,' + sed_rest='s,^[^/]*/*,,' + sed_last='s,^.*/\([^/]*\)$,\1,' + sed_butlast='s,/*[^/]*$,,' + while true; do + first=`echo "$dir2" | sed -e "$sed_first"` + if test "$first" = "."; then + dir2=`echo "$dir2" | sed -e "$sed_rest"` + if test -z "$dir2"; then + relconcat="$dir1" + break + fi + else + last=`echo "$dir1" | sed -e "$sed_last"` + while test "$last" = "."; do + dir1=`echo "$dir1" | sed -e "$sed_butlast"` + last=`echo "$dir1" | sed -e "$sed_last"` + done + if test -z "$dir1"; then + relconcat="$dir2" + break + fi + if test "$first" = ".."; then + if test "$last" = ".."; then + relconcat="$dir1/$dir2" + break + fi + dir1=`echo "$dir1" | sed -e "$sed_butlast"` + dir2=`echo "$dir2" | sed -e "$sed_rest"` + if test -z "$dir1"; then + relconcat="$dir2" + break + fi + if test -z "$dir2"; then + relconcat="$dir1" + break + fi + else + relconcat="$dir1/$dir2" + break + fi + fi + done +} + # Command-line option processing. # Removes the OPTIONS from the arguments. Sets the variables: # - mode list or import or create-testdir or create-megatestdir # - destdir from --dir +# - local_gnulib_dir from --local-dir # - libname, supplied_libname from --lib # - sourcebase from --source-base # - m4base from --m4-base @@ -248,14 +356,18 @@ func_ln_if_changed () # - 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 +# - makefile_name from --makefile-name +# - libtool true if --libtool was given, false if --no-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 # - doit : if actions shall be executed, false if only to be printed +# - symbolic true if --symbolic was given, blank otherwise { mode= destdir= + local_gnulib_dir= libname=libgnu supplied_libname= sourcebase= @@ -266,9 +378,9 @@ func_ln_if_changed () inctests= avoidlist= lgpl= + makefile_name= libtool= macro_prefix= - autoconf_minversion= do_changelog=: doit=: symbolic= @@ -311,6 +423,16 @@ func_ln_if_changed () --dir=* ) destdir=`echo "X$1" | sed -e 's/^X--dir=//'` shift ;; + --local-dir ) + shift + if test $# = 0; then + func_fatal_error "missing argument for --local-dir" + fi + local_gnulib_dir=$1 + shift ;; + --local-dir=* ) + local_gnulib_dir=`echo "X$1" | sed -e 's/^X--local-dir=//'` + shift ;; --lib ) shift if test $# = 0; then @@ -389,9 +511,22 @@ func_ln_if_changed () --lgpl ) lgpl=true shift ;; + --makefile-name ) + shift + if test $# = 0; then + func_fatal_error "missing argument for --makefile-name" + fi + makefile_name="$1" + shift ;; + --makefile-name=* ) + makefile_name=`echo "X$1" | sed -e 's/^X--makefile-name=//'` + shift ;; --libtool ) libtool=true shift ;; + --no-libtool ) + libtool=false + shift ;; --macro-prefix ) shift if test $# = 0; then @@ -402,16 +537,6 @@ 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 ;; @@ -448,10 +573,11 @@ func_ln_if_changed () 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" \ + if test -n "$local_gnulib_dir" || 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 + || test -n "$makefile_name" || 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 @@ -461,15 +587,61 @@ func_ln_if_changed () do_changelog=false fi + # Determine the minimum supported autoconf version from the project's + # configure.ac. DEFAULT_AUTOCONF_MINVERSION="2.59" + autoconf_minversion= + configure_ac= + if { test "$mode" = import || test "$mode" = update; } && test -n "$destdir"; then + if test -f "$destdir"/configure.ac; then + configure_ac="$destdir/configure.ac" + else + if test -f "$destdir"/configure.in; then + configure_ac="$destdir/configure.in" + fi + fi + else + if test -f configure.ac; then + configure_ac="configure.ac" + else + if test -f configure.in; then + configure_ac="configure.in" + fi + fi + fi + if test -n "$configure_ac"; then + # Use sed, not autoconf --trace, to look for the AC_PREREQ invocation, + # because when some m4 files are omitted from a CVS repository, + # "autoconf --trace=AC_PREREQ" fails with an error message like this: + # m4: aclocal.m4:851: Cannot open m4/absolute-header.m4: No such file or directory + # autom4te: m4 failed with exit status: 1 + prereqs= + my_sed_traces=' + s,#.*$,, + s,^dnl .*$,, + s, dnl .*$,, + /AC_PREREQ/ { + s,^.*AC_PREREQ([[ ]*\([^])]*\).*$,prereqs="$prereqs \1",p + }' + eval `sed -n -e "$my_sed_traces" < "$configure_ac"` + if test -n "$prereqs"; then + autoconf_minversion=`for version in $prereqs; do echo $version; done | $SORT -g | uniq | tail -1` + fi + fi + if test -z "$autoconf_minversion"; then + autoconf_minversion=$DEFAULT_AUTOCONF_MINVERSION + fi case "$autoconf_minversion" in 1.* | 2.[0-4]* | 2.5[0-8]*) - func_fatal_error "minimum supported autoconf version is 2.59" ;; + func_fatal_error "minimum supported autoconf version is 2.59. Try adding AC_PREREQ([$DEFAULT_AUTOCONF_MINVERSION]) to your configure.ac." ;; 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 "$local_gnulib_dir" in + */ ) sourcebase=`echo "$local_gnulib_dir" | sed -e "$sed_trimtrailingslashes"` ;; + esac case "$sourcebase" in */ ) sourcebase=`echo "$sourcebase" | sed -e "$sed_trimtrailingslashes"` ;; esac @@ -512,28 +684,83 @@ while test -h "$self_abspathname"; do done gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` +func_tmpdir +trap 'rm -rf "$tmp"' 0 1 2 3 15 + +# func_lookup_file file +# looks up a file in $local_gnulib_dir or $gnulib_dir, or combines it through +# 'patch'. +# Input: +# - local_gnulib_dir from --local-dir +# Output: +# - lookedup_file name of the merged (combined) file +# - lookedup_tmp true if it is located in the tmp directory, blank otherwise +func_lookup_file () +{ + lkfile="$1" + if test -n "$local_gnulib_dir" && test -f "$local_gnulib_dir/$lkfile"; then + lookedup_file="$local_gnulib_dir/$lkfile" + lookedup_tmp= + else + if test -f "$gnulib_dir/$lkfile"; then + if test -n "$local_gnulib_dir" && test -f "$local_gnulib_dir/$lkfile.diff"; then + lkbase=`echo "$lkfile" | sed -e 's,^.*/,,'` + rm -f "$tmp/$lkbase" + cp "$gnulib_dir/$lkfile" "$tmp/$lkbase" + patch -s "$tmp/$lkbase" < "$local_gnulib_dir/$lkfile.diff" \ + || func_fatal_error "patch file $local_gnulib_dir/$lkfile.diff didn't apply cleanly" + lookedup_file="$tmp/$lkbase" + lookedup_tmp=true + else + lookedup_file="$gnulib_dir/$lkfile" + lookedup_tmp= + fi + else + func_fatal_error "file $gnulib_dir/$lkfile not found" + fi + fi +} + # func_all_modules +# Input: +# - local_gnulib_dir from --local-dir func_all_modules () { # Filter out metainformation files like README, which are not modules. # Filter out unit test modules; they can be retrieved through # --extract-tests-module if desired. - (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' \ + { + (cd "$gnulib_dir/modules" && ls -1) + if test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules"; then + (cd "$local_gnulib_dir/modules" && ls -1 | sed -e 's,\.diff$,,') + fi + } \ + | sed -e '/^CVS$/d' -e '/^ChangeLog$/d' -e '/^COPYING$/d' -e '/^README$/d' -e '/^TEMPLATE$/d' -e '/^TEMPLATE-TESTS$/d' -e '/~$/d' \ | sed -e '/-tests$/d' \ - | LC_ALL=C sort + | LC_ALL=C sort \ + | LC_ALL=C uniq } # func_verify_module # verifies a module name +# Input: +# - local_gnulib_dir from --local-dir +# - module module name argument func_verify_module () { - if test ! -f "$gnulib_dir/modules/$module" \ - || test "CVS" = "$module" \ - || test "ChangeLog" = "$module" \ - || test "README" = "$module" \ - || test "TEMPLATE" = "$module" \ - || test "TEMPLATE-TESTS" = "$module"; then + if { test -f "$gnulib_dir/modules/$module" \ + || { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \ + && test -f "$local_gnulib_dir/modules/$module"; }; } \ + && test "CVS" != "$module" \ + && test "ChangeLog" != "$module" \ + && test "COPYING" != "$module" \ + && test "README" != "$module" \ + && test "TEMPLATE" != "$module" \ + && test "TEMPLATE-TESTS" != "$module"; then + # OK, $module is a correct module name. + # Verify that building the module description with 'patch' succeeds. + func_lookup_file "modules/$module" + else echo "gnulib-tool: module $module doesn't exist" 1>&2 module= fi @@ -541,6 +768,9 @@ func_verify_module () # func_verify_nontests_module # verifies a module name, excluding tests modules +# Input: +# - local_gnulib_dir from --local-dir +# - module module name argument func_verify_nontests_module () { case "$module" in @@ -551,6 +781,9 @@ func_verify_nontests_module () # func_verify_tests_module # verifies a module name, considering only tests modules +# Input: +# - local_gnulib_dir from --local-dir +# - module module name argument func_verify_tests_module () { case "$module" in @@ -577,15 +810,21 @@ sed_extract_prog=':[ ]*$/ { }' # func_get_description module +# Input: +# - local_gnulib_dir from --local-dir func_get_description () { - sed -n -e "/^Description$sed_extract_prog" < "$gnulib_dir/modules/$1" + func_lookup_file "modules/$1" + sed -n -e "/^Description$sed_extract_prog" < "$lookedup_file" } # func_get_filelist module +# Input: +# - local_gnulib_dir from --local-dir func_get_filelist () { - sed -n -e "/^Files$sed_extract_prog" < "$gnulib_dir/modules/$1" + func_lookup_file "modules/$1" + sed -n -e "/^Files$sed_extract_prog" < "$lookedup_file" case "$autoconf_minversion" in 2.59) #echo m4/onceonly.m4 @@ -595,50 +834,72 @@ func_get_filelist () } # func_get_dependencies module +# Input: +# - local_gnulib_dir from --local-dir func_get_dependencies () { # ${module}-tests always implicitly depends on ${module}. echo "$1" | sed -n -e 's/-tests//p' # Then the explicit dependencies listed in the module description. - sed -n -e "/^Depends-on$sed_extract_prog" < "$gnulib_dir/modules/$1" + func_lookup_file "modules/$1" + sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file" } # func_get_autoconf_snippet module +# Input: +# - local_gnulib_dir from --local-dir func_get_autoconf_snippet () { - sed -n -e "/^configure\.ac$sed_extract_prog" < "$gnulib_dir/modules/$1" + func_lookup_file "modules/$1" + sed -n -e "/^configure\.ac$sed_extract_prog" < "$lookedup_file" } # func_get_automake_snippet module +# Input: +# - local_gnulib_dir from --local-dir func_get_automake_snippet () { - sed -n -e "/^Makefile\.am$sed_extract_prog" < "$gnulib_dir/modules/$1" + func_lookup_file "modules/$1" + sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" } # func_get_include_directive module +# Input: +# - local_gnulib_dir from --local-dir func_get_include_directive () { - sed -n -e "/^Include$sed_extract_prog" < "$gnulib_dir/modules/$1" | \ + func_lookup_file "modules/$1" + sed -n -e "/^Include$sed_extract_prog" < "$lookedup_file" | \ sed -e 's/^\(["<]\)/#include \1/' } # func_get_license module +# Input: +# - local_gnulib_dir from --local-dir func_get_license () { - sed -n -e "/^License$sed_extract_prog" < "$gnulib_dir/modules/$1" + func_lookup_file "modules/$1" + sed -n -e "/^License$sed_extract_prog" < "$lookedup_file" } # func_get_maintainer module +# Input: +# - local_gnulib_dir from --local-dir func_get_maintainer () { - sed -n -e "/^Maintainer$sed_extract_prog" < "$gnulib_dir/modules/$1" + func_lookup_file "modules/$1" + sed -n -e "/^Maintainer$sed_extract_prog" < "$lookedup_file" } # func_get_tests_module module +# Input: +# - local_gnulib_dir from --local-dir func_get_tests_module () { # The naming convention for tests modules is hardwired: ${module}-tests. - if test -f modules/"$1"-tests; then + if test -f "$gnulib_dir/modules/$1"-tests \ + || { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \ + && test -f "$local_gnulib_dir/modules/$1"-tests; }; then echo "$1"-tests fi } @@ -659,6 +920,7 @@ func_acceptable () # func_modules_transitive_closure # Input: +# - local_gnulib_dir from --local-dir # - modules list of specified modules # - inctests true if tests should be included, blank otherwise # - avoidlist list of modules to avoid @@ -709,6 +971,7 @@ func_modules_transitive_closure () # func_modules_add_dummy # Input: +# - local_gnulib_dir from --local-dir # - modules list of modules, including dependencies # Output: # - modules list of modules, including 'dummy' if needed @@ -743,6 +1006,7 @@ ba # func_modules_to_filelist # Input: +# - local_gnulib_dir from --local-dir # - modules list of modules, including dependencies # Output: # - files list of files @@ -759,20 +1023,31 @@ func_modules_to_filelist () } # func_emit_lib_Makefile_am -# emits the contents of lib/Makefile.am to standard output. +# emits the contents of library makefile to standard output. # Input: +# - local_gnulib_dir from --local-dir # - modules list of modules, including dependencies # - libname library name -# - libtool true if libtool will be used, blank otherwise +# - makefile_name from --makefile-name +# - libtool true if libtool will be used, false or blank otherwise # - actioncmd (optional) command that will reproduce this invocation func_emit_lib_Makefile_am () { - if test -n "$libtool"; then + # When creating an includable Makefile.am snippet, augment variables with + # += instead of assigning them. + if test -n "$makefile_name"; then + assign='+=' + else + assign='=' + fi + if test "$libtool" = true; then libext=la perhapsLT=LT + sed_eliminate_LDFLAGS= else libext=a perhapsLT= + sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' fi echo "## Process this file with automake to produce Makefile.in." func_emit_copyright_notice @@ -780,74 +1055,111 @@ func_emit_lib_Makefile_am () echo "# Reproduce by: $actioncmd" fi echo - # No need to generate dependencies since the sources are in gnulib, not here. - echo "AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies" + if test -z "$makefile_name"; then + # No need to generate dependencies since the sources are in gnulib, not here. + echo "AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies" + fi echo - echo "noinst_${perhapsLT}LIBRARIES = $libname.$libext" + ( + for module in $modules; do + func_verify_nontests_module + if test -n "$module"; then + { + func_get_automake_snippet "$module" | + sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \ + -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' | + sed -e "$sed_eliminate_LDFLAGS" | + sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' | + sed -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ + -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' + if test "$module" = 'alloca'; then + echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@" + fi + } > amsnippet.tmp + # Skip the contents if its entirely empty. + if grep '[^ ]' amsnippet.tmp > /dev/null ; then + echo "## begin gnulib module $module" + echo + cat amsnippet.tmp + echo "## end gnulib module $module" + echo + fi + rm -f amsnippet.tmp + fi + done + ) > allsnippets.tmp + if grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *= *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then + # One of the snippets already specifies an installation location for the + # library. Don't confuse automake by saying it should not be installed. + : + else + # By default, the generated library should not be installed. + echo "noinst_${perhapsLT}LIBRARIES $assign $libname.$libext" + fi 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 - { - func_get_automake_snippet "$module" | - sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' - if test "$module" = 'alloca'; then - echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@" - fi - } > amsnippet.tmp - # Skip the contents if its entirely empty. - if grep '[^ ]' amsnippet.tmp > /dev/null ; then - echo "## begin gnulib module $module" - echo - cat amsnippet.tmp - echo "## end gnulib module $module" - echo - fi - rm -f amsnippet.tmp + if test "$libtool" = true; then + echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)" + fi + if test -z "$makefile_name"; then + echo "noinst_HEADERS =" + # 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 - done + echo "EXTRA_DIST =" + echo "BUILT_SOURCES =" + echo "SUFFIXES =" + fi + echo "MOSTLYCLEANFILES $assign core *.stackdump" + if test -z "$makefile_name"; then + echo "MOSTLYCLEANDIRS =" + echo "CLEANFILES =" + echo "DISTCLEANFILES =" + echo "MAINTAINERCLEANFILES =" + echo + echo "AM_CPPFLAGS =" + fi echo - echo "mostlyclean-local:" + cat allsnippets.tmp + echo + echo "mostlyclean-local: mostlyclean-generic" echo " @test -z \"\$(MOSTLYCLEANDIRS)\" || \\" echo " for dir in \$(MOSTLYCLEANDIRS); do \\" echo " if test -d \$\$dir; then \\" echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" echo " fi; \\" echo " done" - echo - echo "# Makefile.am ends here" + rm -f allsnippets.tmp } # func_emit_tests_Makefile_am -# emits the contents of tests/Makefile.am to standard output. +# emits the contents of tests makefile to standard output. # Input: +# - local_gnulib_dir from --local-dir # - modules list of modules, including dependencies # - libname library name -# - libtool true if libtool will be used, blank otherwise +# - 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 func_emit_tests_Makefile_am () { - if test -n "$libtool"; then + if test "$libtool" = true; then libext=la else libext=a fi + if test "$libtool" = true; then + libext=la + sed_eliminate_LDFLAGS= + else + libext=a + sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' + fi testsbase_inverse=`echo "$testsbase" | sed -e 's,/$,,' | sed -e 's,[^/][^/]*,..,g'` echo "## Process this file with automake to produce Makefile.in." func_emit_copyright_notice @@ -857,6 +1169,31 @@ func_emit_tests_Makefile_am () echo echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}" echo + ( + for module in $modules; do + func_verify_tests_module + if test -n "$module"; then + { + func_get_automake_snippet "$module" | + sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \ + -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' | + sed -e "$sed_eliminate_LDFLAGS" | + sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' | + sed -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ + -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' + } > amsnippet.tmp + # Skip the contents if its entirely empty. + if grep '[^ ]' amsnippet.tmp > /dev/null ; then + echo "## begin gnulib module $module" + echo + cat amsnippet.tmp + echo "## end gnulib module $module" + echo + fi + rm -f amsnippet.tmp + fi + done + ) > allsnippets.tmp # 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" @@ -866,10 +1203,13 @@ func_emit_tests_Makefile_am () echo "noinst_PROGRAMS =" echo "check_PROGRAMS =" echo "noinst_HEADERS =" + if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then + echo "pkgdata_DATA =" + fi echo "EXTRA_DIST =" echo "BUILT_SOURCES =" echo "SUFFIXES =" - echo "MOSTLYCLEANFILES =" + echo "MOSTLYCLEANFILES = core *.stackdump" echo "MOSTLYCLEANDIRS =" echo "CLEANFILES =" echo "DISTCLEANFILES =" @@ -882,39 +1222,25 @@ func_emit_tests_Makefile_am () echo 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 - echo "## begin gnulib module $module" - echo - cat amsnippet.tmp - echo "## end gnulib module $module" - echo - fi - rm -f amsnippet.tmp - fi - done + cat allsnippets.tmp echo "# Clean up after Solaris cc." echo "clean-local:" echo " rm -rf SunWS_cache" echo - echo "mostlyclean-local:" + echo "mostlyclean-local: mostlyclean-generic" echo " @test -z \"\$(MOSTLYCLEANDIRS)\" || \\" echo " for dir in \$(MOSTLYCLEANDIRS); do \\" echo " if test -d \$\$dir; then \\" echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" echo " fi; \\" echo " done" - echo - echo "# Makefile.am ends here" + rm -f allsnippets.tmp } # func_import modules # Uses also the variables # - destdir target directory +# - local_gnulib_dir from --local-dir # - libname library name # - sourcebase directory relative to destdir where to place source code # - m4base directory relative to destdir where to place *.m4 macros @@ -924,8 +1250,10 @@ func_emit_tests_Makefile_am () # - 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 +# - makefile_name from --makefile-name +# - libtool true if --libtool was given, false if --no-libtool was +# given, blank otherwise +# - guessed_libtool true if the configure.ac file uses libtool, false otherwise # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use # - autoconf_minversion minimum supported autoconf version # - doit : if actions shall be executed, false if only to be printed @@ -933,6 +1261,7 @@ func_emit_tests_Makefile_am () func_import () { # Get the cached settings. + cached_local_gnulib_dir= cached_specified_modules= cached_avoidlist= cached_sourcebase= @@ -941,15 +1270,19 @@ func_import () cached_testsbase= cached_libname= cached_lgpl= + cached_makefile_name= cached_libtool= cached_macro_prefix= - cached_autoconf_minversion= cached_files= if test -f "$destdir"/$m4base/gnulib-cache.m4; then + cached_libtool=false my_sed_traces=' s,#.*$,, s,^dnl .*$,, s, dnl .*$,, + /gl_LOCAL_DIR(/ { + s,^.*gl_LOCAL_DIR([[ ]*\([^])]*\).*$,cached_local_gnulib_dir="\1",p + } /gl_MODULES(/ { s,^.*gl_MODULES([[ ]*\([^])]*\).*$,cached_specified_modules="\1",p } @@ -974,14 +1307,14 @@ func_import () /gl_LGPL/ { s,^.*$,cached_lgpl=true,p } + /gl_MAKEFILE_NAME(/ { + s,^.*gl_MAKEFILE_NAME([[ ]*\([^])]*\).*$,cached_makefile_name="\1",p + } /gl_LIBTOOL/ { s,^.*$,cached_libtool=true,p } /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 @@ -1011,6 +1344,24 @@ func_import () if test -n "$cached_m4base" && test "$cached_m4base" != "$m4base"; then func_fatal_error "$m4base/gnulib-cache.m4 is expected to contain gl_M4_BASE([$m4base])" fi + # The local_gnulib_dir defaults to the cached one. Recall that the cached one + # is relative to $destdir, whereas the one we use is relative to . or absolute. + if test -z "$local_gnulib_dir"; then + if test -n "$cached_local_gnulib_dir"; then + case "$destdir" in + /*) + local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;; + *) + case "$cached_local_gnulib_dir" in + /*) + local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;; + *) + func_relconcat "$destdir" "$cached_local_gnulib_dir" + local_gnulib_dir="$relconcat" ;; + esac ;; + esac + fi + fi # Append the cached and the specified module names. So that # "gnulib-tool --import foo" means to add the module foo. specified_modules="$cached_specified_modules $1" @@ -1028,7 +1379,7 @@ func_import () if test -z "$docbase"; then docbase="$cached_docbase" if test -z "$docbase"; then - func_fatal_error "missing --doc-base option" + func_fatal_error "missing --doc-base option. --doc-base has been introduced on 2006-07-11; if your last invocation of 'gnulib-tool --import' is before that date, you need to run 'gnulib-tool --import' once, with a --doc-base option." fi fi # The testsbase defaults to the cached one. @@ -1049,6 +1400,10 @@ func_import () if test -z "$lgpl"; then lgpl="$cached_lgpl" fi + # The makefile_name defaults to the cached one. + if test -z "$makefile_name"; then + makefile_name="$cached_makefile_name" + fi # Use libtool if specified either way, or if guessed. if test -z "$libtool"; then if test -n "$cached_m4base"; then @@ -1064,13 +1419,6 @@ 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 | LC_ALL=C sort | LC_ALL=C uniq` @@ -1084,17 +1432,37 @@ func_import () # Add the dummy module if needed. func_modules_add_dummy - # If --lgpl, check the license of modules are compatible. + # If --lgpl, verify that the licenses of modules are compatible. if test -n "$lgpl"; then for module in $modules; do license=`func_get_license $module` case $license in - LGPL | 'GPLed build tool' | 'public domain' | 'unlimited') ;; + LGPL | 'GPLed build tool') ;; + 'public domain' | 'unlimited' | 'unmodifiable license text') ;; *) func_fatal_error "incompatible license on module $module: $license" ;; esac done fi + # Determine script to apply to imported library files. + sed_transform_lib_file= + for module in $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' + s/^#ifdef[ ]*HAVE_CONFIG_H[ ]*$/#if 1/ + ' + break + fi + done + 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 + ' + fi + # Determine final file list. func_modules_to_filelist echo "File list:" @@ -1127,12 +1495,15 @@ func_import () echo "Create directory $destdir/$m4base" fi fi - 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" + 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 @@ -1154,8 +1525,6 @@ func_import () fi fi - 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: @@ -1215,14 +1584,13 @@ func_import () func_add_or_update () { func_dest_tmpfilename "$g" - cp "$gnulib_dir/$f" "$tmpfile" || func_fatal_error "failed" - if test -n "$lgpl"; then - # Update license. + func_lookup_file "$f" + cp "$lookedup_file" "$tmpfile" || func_fatal_error "failed" + if test -n "$sed_transform_lib_file"; then 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" > "$tmpfile" || func_fatal_error "failed" + sed -e "$sed_transform_lib_file" \ + < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" ;; esac fi @@ -1239,8 +1607,9 @@ 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" "$tmpfile" > /dev/null; then - func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g" + if test -n "$symbolic" && test -z "$lookedup_tmp" \ + && cmp "$lookedup_file" "$tmpfile" > /dev/null; then + func_ln_if_changed "$lookedup_file" "$destdir/$g" else mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" fi @@ -1258,8 +1627,9 @@ 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" "$tmpfile" > /dev/null; then - func_ln_if_changed "$gnulib_dir/$f" "$destdir/$g" + if test -n "$symbolic" && test -z "$lookedup_tmp" \ + && cmp "$lookedup_file" "$tmpfile" > /dev/null; then + func_ln_if_changed "$lookedup_file" "$destdir/$g" else mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" fi @@ -1300,6 +1670,9 @@ func_import () # Command-line invocation printed in a comment in generated gnulib-cache.m4. actioncmd="gnulib-tool --import" actioncmd="$actioncmd --dir=$destdir" + if test -n "$local_gnulib_dir"; then + actioncmd="$actioncmd --local-dir=$local_gnulib_dir" + fi actioncmd="$actioncmd --lib=$libname" actioncmd="$actioncmd --source-base=$sourcebase" actioncmd="$actioncmd --m4-base=$m4base" @@ -1311,35 +1684,46 @@ func_import () if test -n "$lgpl"; then actioncmd="$actioncmd --lgpl" fi - if test -n "$libtool"; then + if test -n "$makefile_name"; then + actioncmd="$actioncmd --makefile_name=$makefile_name" + fi + if test "$libtool" = true; then actioncmd="$actioncmd --libtool" + else + actioncmd="$actioncmd --no-libtool" fi actioncmd="$actioncmd --macro-prefix=$macro_prefix" - actioncmd="$actioncmd --assume-autoconf=$autoconf_minversion" actioncmd="$actioncmd `echo $specified_modules`" - # Create lib/Makefile.am. - func_dest_tmpfilename $sourcebase/Makefile.am + # Default the makefile name to Makefile.am. + if test -n "$makefile_name"; then + makefile_am=$makefile_name + else + makefile_am=Makefile.am + fi + + # Create library makefile. + 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 + 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 "$tmpfile" "$destdir"/$sourcebase/Makefile.am + echo "Updating $sourcebase/$makefile_am (backup in $sourcebase/$makefile_am~)" + mv -f "$destdir"/$sourcebase/$makefile_am "$destdir"/$sourcebase/$makefile_am~ + mv -f "$tmpfile" "$destdir"/$sourcebase/$makefile_am else - echo "Update $sourcebase/Makefile.am (backup in $sourcebase/Makefile.am~)" + echo "Update $sourcebase/$makefile_am (backup in $sourcebase/$makefile_am~)" rm -f "$tmpfile" fi fi else if $doit; then - echo "Creating $sourcebase/Makefile.am" - mv -f "$tmpfile" "$destdir"/$sourcebase/Makefile.am + echo "Creating $sourcebase/$makefile_am" + mv -f "$tmpfile" "$destdir"/$sourcebase/$makefile_am else - echo "Create $sourcebase/Makefile.am" + echo "Create $sourcebase/$makefile_am" rm -f "$tmpfile" fi fi @@ -1359,6 +1743,20 @@ func_import () echo "# $actioncmd" echo echo "# Specification in the form of a few gnulib-tool.m4 macro invocations:" + # Store the local_gnulib_dir relative to destdir. + case "$local_gnulib_dir" in + "" | /*) + relative_local_gnulib_dir="$local_gnulib_dir" ;; + * ) + case "$destdir" in + /*) relative_local_gnulib_dir="$local_gnulib_dir" ;; + *) + # destdir, local_gnulib_dir are both relative. + func_relativize "$destdir" "$local_gnulib_dir" + relative_local_gnulib_dir="$reldir" ;; + esac ;; + esac + echo "gl_LOCAL_DIR([$relative_local_gnulib_dir])" echo "gl_MODULES(["`echo $specified_modules`"])" echo "gl_AVOID([$avoidlist])" echo "gl_SOURCE_BASE([$sourcebase])" @@ -1367,9 +1765,11 @@ func_import () echo "gl_TESTS_BASE([$testsbase])" echo "gl_LIB([$libname])" test -z "$lgpl" || echo "gl_LGPL" - test -z "$libtool" || echo "gl_LIBTOOL" + echo "gl_MAKEFILE_NAME([$makefile_name])" + if test "$libtool" = true; then + echo "gl_LIBTOOL" + fi echo "gl_MACRO_PREFIX([$macro_prefix])" - 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 @@ -1416,6 +1816,8 @@ func_import () echo "# any checks for libraries, header files, types and library functions." echo "AC_DEFUN([${macro_prefix}_EARLY]," echo "[" + echo " m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace" + echo " m4_pattern_allow([^gl_ES$])dnl a valid locale name" echo " 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])" @@ -1424,7 +1826,7 @@ func_import () 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])" + echo " AC_REQUIRE([gl_LOCK_EARLY])" fi echo "])" echo @@ -1432,10 +1834,14 @@ func_import () 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 + if test "$libtool" = true; then echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" + echo " gl_cond_libtool=true" + else + echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" + echo " gl_cond_libtool=false" + echo " gl_libdeps=" + echo " gl_ltlibdeps=" fi if test "$auxdir" != "build-aux"; then sed_replace_build_aux=' @@ -1455,7 +1861,7 @@ func_import () | 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 + if test "$module" = 'alloca' && test "$libtool" = true; then echo 'changequote(,)dnl' echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' echo 'changequote([, ])dnl' @@ -1463,6 +1869,15 @@ func_import () fi fi done + # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is + # created using libtool, because libtool already handles the dependencies. + if test "$libtool" != true; then + libname_upper=`echo "$libname" | tr 'a-z' 'A-Z'` + echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" + echo " AC_SUBST([${libname_upper}_LIBDEPS])" + echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" + echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" + fi echo "])" echo echo "# This macro records the list of files which have been installed by" @@ -1501,42 +1916,33 @@ func_import () fi if test -n "$inctests"; then - # Create tests/Makefile.am. - func_dest_tmpfilename $testsbase/Makefile.am + # Create tests makefile. + 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 + 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 + 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~)" + 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 + echo "Creating $testsbase/$makefile_am" + mv -f "$tmpfile" "$destdir"/$testsbase/$makefile_am else - echo "Create $testsbase/Makefile.am" + 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." @@ -1566,17 +1972,29 @@ func_import () ) | sed -e '/^$/d;' -e 's/^/ /' echo echo "Don't forget to" - echo " - add \"$sourcebase/Makefile\" to AC_CONFIG_FILES in $configure_ac," + if test "$makefile_am" = Makefile.am; then + echo " - add \"$sourcebase/Makefile\" to AC_CONFIG_FILES in $configure_ac," + else + echo " - \"include $makefile_name\" from within \"$sourcebase/Makefile.am\"," + fi if test -n "$inctests"; then - echo " - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in $configure_ac," + if test "$makefile_am" = Makefile.am; then + echo " - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in $configure_ac," + else + echo " - \"include $makefile_name\" from within \"$testsbase/Makefile.am\"," + fi + fi + if test "$makefile_am" = Makefile.am; then + sourcebase_dir=`echo "$sourcebase" | sed -n -e 's,/[^/]*$,/,p'` + sourcebase_base=`basename "$sourcebase"` + echo " - mention \"${sourcebase_base}\" in SUBDIRS in ${sourcebase_dir}Makefile.am," 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," + if test "$makefile_am" = Makefile.am; 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 fi echo " - mention \"-I ${m4base}\" in ACLOCAL_AMFLAGS in Makefile.am," echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after AC_PROG_CC," @@ -1585,6 +2003,7 @@ func_import () # func_create_testdir testdir modules # Input: +# - local_gnulib_dir from --local-dir # - auxdir directory relative to destdir where to place build aux files func_create_testdir () { @@ -1592,6 +2011,11 @@ func_create_testdir () modules="$2" modules=`for m in $modules; do echo $m; done | LC_ALL=C sort | LC_ALL=C uniq` + # Subdirectory names. + sourcebase=gllib + m4base=glm4 + testsbase=gltests + # Determine final module list. func_modules_transitive_closure echo "Module list with included dependencies:" @@ -1607,33 +2031,43 @@ func_create_testdir () # Create directories. for d in `echo "$files" | sed -n -e 's,^\(.*\)/[^/]*,\1,p'`; do - if test "$d" = build-aux; then - mkdir -p "$testdir/$auxdir" - else - mkdir -p "$testdir/$d" - fi + case "$d" in + build-aux) mkdir -p "$testdir/$auxdir" ;; + lib) mkdir -p "$testdir/$sourcebase" ;; + m4) mkdir -p "$testdir/$m4base" ;; + tests) mkdir -p "$testdir/$testsbase" ;; + *) mkdir -p "$testdir/$d" ;; + esac done # Copy files or make symbolic links. for f in $files; do + func_lookup_file "$f" case "$f" in build-aux/*) g=`echo "$f" | sed -e "s,^build-aux/,$auxdir/,"` ;; + lib/*) g=`echo "$f" | sed -e "s,^lib/,$sourcebase/,"` ;; + m4/*) g=`echo "$f" | sed -e "s,^m4/,$m4base/,"` ;; + tests/*) g=`echo "$f" | sed -e "s,^tests/,$testsbase/,"` ;; *) g="$f" ;; esac - ln "$gnulib_dir/$f" "$testdir/$g" 2>/dev/null || - if test -z "$symbolic"; then - cp -p "$gnulib_dir/$f" "$testdir/$g" + if test -n "$lookedup_tmp"; then + cp -p "$lookedup_file" "$testdir/$g" else - ln -s "$gnulib_dir/$f" "$testdir/$g" + ln "$lookedup_file" "$testdir/$g" 2>/dev/null || + if test -z "$symbolic"; then + cp -p "$lookedup_file" "$testdir/$g" + else + ln -s "$lookedup_file" "$testdir/$g" + fi fi done - # Create lib/Makefile.am. - mkdir -p "$testdir/lib" - func_emit_lib_Makefile_am > "$testdir/lib/Makefile.am" + # Create $sourcebase/Makefile.am. + mkdir -p "$testdir/$sourcebase" + func_emit_lib_Makefile_am > "$testdir/$sourcebase/Makefile.am" - # Create m4/Makefile.am. - mkdir -p "$testdir/m4" + # Create $m4base/Makefile.am. + mkdir -p "$testdir/$m4base" (echo "## Process this file with automake to produce Makefile.in." echo echo "EXTRA_DIST =" @@ -1643,12 +2077,12 @@ func_create_testdir () echo "EXTRA_DIST += "`echo "$f" | sed -e 's,^m4/,,'` ;; esac done - ) > "$testdir/m4/Makefile.am" + ) > "$testdir/$m4base/Makefile.am" - subdirs="lib m4" + subdirs="$sourcebase $m4base" subdirs_with_configure_ac="" - if test -f "$testdir"/m4/gettext.m4; then + if test -f "$testdir"/$m4base/gettext.m4; then # Avoid stupid error message from automake: # "AM_GNU_GETTEXT used but `po' not in SUBDIRS" mkdir -p "$testdir/po" @@ -1658,13 +2092,10 @@ func_create_testdir () fi if test -n "$inctests"; then - 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. + test -d "$testdir/$testsbase" || mkdir "$testdir/$testsbase" + # Create $testsbase/Makefile.am. + func_emit_tests_Makefile_am > "$testdir/$testsbase/Makefile.am" + # Create $testsbase/configure.ac. (echo "# Process this file with autoconf to produce a configure script." echo "AC_INIT([dummy], [0])" echo "AC_CONFIG_AUX_DIR([../$auxdir])" @@ -1677,23 +2108,35 @@ func_create_testdir () echo "AC_PROG_MAKE_SET" echo "AC_PROG_RANLIB" echo - if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then + if grep AC_GNU_SOURCE "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then echo "AC_GNU_SOURCE" echo fi - if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then + if grep gl_USE_SYSTEM_EXTENSIONS "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then echo "gl_USE_SYSTEM_EXTENSIONS" echo fi - if grep gl_LOCK "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then - echo "gl_LOCK" + if grep gl_LOCK "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then + echo "gl_LOCK_EARLY" echo fi - if test -z "$libtool"; then - echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" - else + if test "$libtool" = true; then echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" + echo "gl_cond_libtool=true" + else + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" + echo "gl_cond_libtool=false" + echo "gl_libdeps=" + echo "gl_ltlibdeps=" fi + # 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: + # error: AC_REQUIRE(gt_CSHARPCOMP): cannot be used outside of an AC_DEFUN'd macro + # but we want the AC_REQUIRE to have its normal meaning (provide one + # expansion of the required macro before the current point, and only one + # expansion total). + echo "AC_DEFUN([gl_INIT], [" if test "$auxdir" != "build-aux"; then sed_replace_build_aux=' :a @@ -1722,15 +2165,26 @@ func_create_testdir () | sed -e "$sed_replace_build_aux" fi done + # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is + # created using libtool, because libtool already handles the dependencies. + if test "$libtool" != true; then + libname_upper=`echo "$libname" | tr 'a-z' 'A-Z'` + echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" + echo " AC_SUBST([${libname_upper}_LIBDEPS])" + echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" + echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" + fi + echo "])" + echo "gl_INIT" echo - # Usually tests/config.h will be a superset of config.h. Verify this by - # "merging" config.h into tests/config.h; look out for gcc warnings. + # Usually $testsbase/config.h will be a superset of config.h. Verify this + # by "merging" config.h into $testsbase/config.h; look out for gcc warnings. echo "AH_TOP([#include \"../config.h\"])" echo echo "AC_OUTPUT([Makefile])" - ) > "$testdir/tests/configure.ac" - subdirs="$subdirs tests" - subdirs_with_configure_ac="$subdirs_with_configure_ac tests" + ) > "$testdir/$testsbase/configure.ac" + subdirs="$subdirs $testsbase" + subdirs_with_configure_ac="$subdirs_with_configure_ac $testsbase" fi # Create Makefile.am. @@ -1740,7 +2194,7 @@ func_create_testdir () echo echo "SUBDIRS = $subdirs" echo - echo "ACLOCAL_AMFLAGS = -I m4" + echo "ACLOCAL_AMFLAGS = -I $m4base" ) > "$testdir/Makefile.am" # Create configure.ac. @@ -1756,25 +2210,41 @@ func_create_testdir () echo "AC_PROG_CC" echo "AC_PROG_INSTALL" echo "AC_PROG_MAKE_SET" + echo + echo "m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace" + echo "m4_pattern_allow([^gl_ES$])dnl a valid locale name" + echo echo "AC_PROG_RANLIB" echo - if grep AC_GNU_SOURCE "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then + if grep AC_GNU_SOURCE "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then echo "AC_GNU_SOURCE" echo fi - if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then + if grep gl_USE_SYSTEM_EXTENSIONS "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then echo "gl_USE_SYSTEM_EXTENSIONS" echo fi - if grep gl_LOCK "$testdir"/m4/*.m4 >/dev/null 2>/dev/null; then - echo "gl_LOCK" + if grep gl_LOCK "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then + echo "gl_LOCK_EARLY" echo fi - if test -z "$libtool"; then - echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" - else + if test "$libtool" = true; then echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" + echo "gl_cond_libtool=true" + else + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" + echo "gl_cond_libtool=false" + echo "gl_libdeps=" + echo "gl_ltlibdeps=" fi + # 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: + # error: AC_REQUIRE(gt_CSHARPCOMP): cannot be used outside of an AC_DEFUN'd macro + # but we want the AC_REQUIRE to have its normal meaning (provide one + # expansion of the required macro before the current point, and only one + # expansion total). + echo "AC_DEFUN([gl_INIT], [" if test "$auxdir" != "build-aux"; then sed_replace_build_aux=' :a @@ -1793,6 +2263,17 @@ func_create_testdir () | sed -e "$sed_replace_build_aux" fi done + # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is + # created using libtool, because libtool already handles the dependencies. + if test "$libtool" != true; then + libname_upper=`echo "$libname" | tr 'a-z' 'A-Z'` + echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" + echo " AC_SUBST([${libname_upper}_LIBDEPS])" + echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" + echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" + fi + echo "])" + echo "gl_INIT" echo if test -n "$subdirs_with_configure_ac"; then echo "AC_CONFIG_SUBDIRS(["`echo $subdirs_with_configure_ac`"])" @@ -1814,10 +2295,10 @@ func_create_testdir () echo "executing ${AUTORECONF} --force --install" ${AUTORECONF} --force --install ) - if grep '^BUILT_SOURCES *+=' "$testdir/lib/Makefile.am" > /dev/null; then + if grep '^BUILT_SOURCES *+=' "$testdir/$sourcebase/Makefile.am" > /dev/null; then (cd "$testdir" ./configure - cd lib + cd "$sourcebase" echo 'built_sources: $(BUILT_SOURCES)' >> Makefile make built_sources cd .. @@ -1828,6 +2309,7 @@ func_create_testdir () # func_create_megatestdir megatestdir allmodules # Input: +# - local_gnulib_dir from --local-dir # - auxdir directory relative to destdir where to place build aux files func_create_megatestdir () { @@ -1915,12 +2397,9 @@ case $mode in fi fi - test -f "$destdir"/Makefile.am \ - || func_fatal_error "cannot find $destdir/Makefile.am" - # Analyze configure.ac. guessed_auxdir="." - guessed_libtool= + guessed_libtool=false my_sed_traces=' s,#.*$,, s,^dnl .*$,, @@ -1948,7 +2427,6 @@ case $mode in 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 @@ -1956,30 +2434,41 @@ 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/'` m4dirs= m4dirs_count=0 - m4dir_is_next= - for arg in $aclocal_amflags; do - if test -n "$m4dir_is_next"; then - # Ignore absolute directory pathnames, like /usr/local/share/aclocal. - case "$arg" in - /*) ;; - *) - if test -f "$destdir/$arg"/gnulib-cache.m4; then - m4dirs="$m4dirs $arg" - m4dirs_count=`expr $m4dirs_count + 1` - fi - ;; - esac - else - if test "X$arg" = "X-I"; then - m4dir_is_next=yes + if test -f "$destdir"/Makefile.am; then + aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ ]*=' "$destdir"/Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/'` + m4dir_is_next= + for arg in $aclocal_amflags; do + if test -n "$m4dir_is_next"; then + # Ignore absolute directory pathnames, like /usr/local/share/aclocal. + case "$arg" in + /*) ;; + *) + if test -f "$destdir/$arg"/gnulib-cache.m4; then + m4dirs="$m4dirs $arg" + m4dirs_count=`expr $m4dirs_count + 1` + fi + ;; + esac else - m4dir_is_next= + if test "X$arg" = "X-I"; then + m4dir_is_next=yes + else + m4dir_is_next= + fi fi + done + else + # No Makefile.am! Oh well. Look at the last generated aclocal.m4. + if test -f "$destdir"/aclocal.m4; then + sedexpr1='s,^m4_include(\[\(.*\)])$,\1,p' + sedexpr2='s,^[^/]*$,.,' + sedexpr3='s,/[^/]*$,,' + m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort | LC_ALL=C uniq` + m4dirs_count=`echo "$m4dirs" | wc -l` fi - done + fi if test $m4dirs_count = 0; then # First use of gnulib in a package. # Any number of additional modules can be given. @@ -1989,7 +2478,6 @@ case $mode in 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 @@ -2003,7 +2491,12 @@ case $mode in if test $# = 0; then # No further arguments. Guess the user wants to update all of them. for m4base in $m4dirs; do - func_import + # Perform func_import in a subshell, so that variable values + # such as + # local_gnulib_dir, avoidlist, sourcebase, m4base, docbase, + # testsbase, libname, lgpl, makefile_name, libtool, macro_prefix + # don't propagate from one directory to another. + (func_import) || exit 1 done else # Really ambiguous. @@ -2174,4 +2667,18 @@ case $mode in func_fatal_error "unknown operation mode --$mode" ;; esac +rm -rf "$tmp" +# Undo the effect of the previous 'trap' command. Some shellology: +# We cannot use "trap - 0 1 2 3 15", because Solaris sh would attempt to +# 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 + exit 0 + +# Local Variables: +# indent-tabs-mode: nil +# whitespace-check-buffer-indent: nil +# End: