X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gnulib-tool;h=a36809afc1983e71043a7b15f9139d5f49f38e32;hb=e7f78f8316ca3a99403099e424489b8122e9e961;hp=4f782cc1d7837241fa37e8702f91ed3f1329550e;hpb=0e4068587aebac729a06ce96e8dc6d0cf71f881e;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index 4f782cc1d..a36809afc 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2006-07-20 14:22:07 $' +cvsdatestamp='$Date: 2006-07-31 11:37:23 $' 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 () @@ -100,36 +106,43 @@ Operation modes: --extract-maintainer report the maintainer(s) inside gnulib --extract-tests-module report the unit test module, if it exists -Options: +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". + --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 ." } @@ -246,9 +259,14 @@ 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 +# - 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 +# - local_gnulib_dir from --local-dir +# - symbolic true if --symbolic was given, blank otherwise { mode= destdir= @@ -266,6 +284,7 @@ func_ln_if_changed () macro_prefix= do_changelog=: doit=: + local_gnulib_dir= symbolic= supplied_opts="$@" @@ -387,6 +406,9 @@ func_ln_if_changed () --libtool ) libtool=true shift ;; + --no-libtool ) + libtool=false + shift ;; --macro-prefix ) shift if test $# = 0; then @@ -403,6 +425,16 @@ func_ln_if_changed () --dry-run ) doit=false 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 ;; -s | --symbolic | --symboli | --symbol | --symbo | --symb | --symlink | --symlin | --symli | --syml | --sym | --sy ) symbolic=true shift ;; @@ -446,6 +478,55 @@ 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. 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,' @@ -491,23 +572,66 @@ 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'. +# 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 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) \ + { + (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 '/^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 func_verify_module () { - if test ! -f "$gnulib_dir/modules/$module" \ + 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 "README" = "$module" \ @@ -558,15 +682,21 @@ sed_extract_prog=':[ ]*$/ { # func_get_description module 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 func_get_filelist () { - sed -n -e "/^Files$sed_extract_prog" < "$gnulib_dir/modules/$1" - #echo m4/onceonly.m4 - #echo m4/onceonly_2_57.m4 + func_lookup_file "modules/$1" + sed -n -e "/^Files$sed_extract_prog" < "$lookedup_file" + case "$autoconf_minversion" in + 2.59) + #echo m4/onceonly.m4 + echo m4/onceonly_2_57.m4 + ;; + esac } # func_get_dependencies module @@ -575,38 +705,44 @@ 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 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 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 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 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 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 @@ -738,11 +874,11 @@ func_modules_to_filelist () # Input: # - modules list of modules, including dependencies # - libname library name -# - libtool true if libtool will be used, blank otherwise +# - 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 + if test "$libtool" = true; then libext=la perhapsLT=LT else @@ -766,7 +902,7 @@ func_emit_lib_Makefile_am () echo "EXTRA_DIST =" echo "BUILT_SOURCES =" echo "SUFFIXES =" - echo "MOSTLYCLEANFILES =" + echo "MOSTLYCLEANFILES = core *.stackdump" echo "MOSTLYCLEANDIRS =" echo "CLEANFILES =" echo "DISTCLEANFILES =" @@ -812,13 +948,13 @@ func_emit_lib_Makefile_am () # Input: # - modules list of modules, including dependencies # - libname library name -# - libtool true if libtool will be used, blank otherwise +# - 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 @@ -844,7 +980,7 @@ func_emit_tests_Makefile_am () echo "EXTRA_DIST =" echo "BUILT_SOURCES =" echo "SUFFIXES =" - echo "MOSTLYCLEANFILES =" + echo "MOSTLYCLEANFILES = core *.stackdump" echo "MOSTLYCLEANDIRS =" echo "CLEANFILES =" echo "DISTCLEANFILES =" @@ -899,9 +1035,11 @@ 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 +# - 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 # - symbolic true if files should be symlinked, copied otherwise func_import () @@ -919,6 +1057,7 @@ func_import () cached_macro_prefix= cached_files= if test -f "$destdir"/$m4base/gnulib-cache.m4; then + cached_libtool=false my_sed_traces=' s,#.*$,, s,^dnl .*$,, @@ -998,7 +1137,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. @@ -1090,12 +1229,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 @@ -1117,8 +1259,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: @@ -1178,14 +1318,15 @@ func_import () func_add_or_update () { func_dest_tmpfilename "$g" - cp "$gnulib_dir/$f" "$tmpfile" || func_fatal_error "failed" + func_lookup_file "$f" + cp "$lookedup_file" "$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" > "$tmpfile" || func_fatal_error "failed" + < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" ;; esac fi @@ -1202,8 +1343,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 @@ -1221,8 +1363,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 @@ -1274,8 +1417,10 @@ func_import () if test -n "$lgpl"; then actioncmd="$actioncmd --lgpl" fi - if test -n "$libtool"; then + if test "$libtool" = true; then actioncmd="$actioncmd --libtool" + else + actioncmd="$actioncmd --no-libtool" fi actioncmd="$actioncmd --macro-prefix=$macro_prefix" actioncmd="$actioncmd `echo $specified_modules`" @@ -1329,7 +1474,9 @@ func_import () echo "gl_TESTS_BASE([$testsbase])" echo "gl_LIB([$libname])" test -z "$lgpl" || echo "gl_LGPL" - test -z "$libtool" || echo "gl_LIBTOOL" + if test "$libtool" = true; then + echo "gl_LIBTOOL" + fi echo "gl_MACRO_PREFIX([$macro_prefix])" ) > "$tmpfile" if test -f "$destdir"/$m4base/gnulib-cache.m4; then @@ -1393,10 +1540,10 @@ 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])" + else + echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" fi if test "$auxdir" != "build-aux"; then sed_replace_build_aux=' @@ -1416,7 +1563,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' @@ -1489,15 +1636,6 @@ func_import () 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." @@ -1577,15 +1715,20 @@ func_create_testdir () # 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/,"` ;; *) 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 @@ -1650,10 +1793,10 @@ func_create_testdir () echo "gl_LOCK" 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])" + else + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" fi if test "$auxdir" != "build-aux"; then sed_replace_build_aux=' @@ -1731,10 +1874,10 @@ func_create_testdir () echo "gl_LOCK" 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])" + else + echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" fi if test "$auxdir" != "build-aux"; then sed_replace_build_aux=' @@ -1876,12 +2019,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 .*$,, @@ -1916,30 +2056,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. @@ -2133,4 +2284,13 @@ 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