X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=2d992bc9eb2ace4616d76372502595f33e0eb721;hb=76bd5cd5304484617bd8b15bfc8a59b0264482b8;hp=40e9efe299abb20761b90ec83ab1871326779fa0;hpb=03c3962db1c3a53ee0d90e6c4daaf7872d838422;p=gnulib.git

diff --git a/gnulib-tool b/gnulib-tool
index 40e9efe29..2d992bc9e 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2004-10-15 16:45:28 $'
+cvsdatestamp='$Date: 2004-10-17 17:50:25 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -450,15 +450,29 @@ func_emit_lib_Makefile_am ()
   echo "CLEANFILES ="
   echo "DISTCLEANFILES ="
   echo "MAINTAINERCLEANFILES ="
+  echo
   for module in $modules; do
     func_verify_module
     if test -n "$module"; then
-      func_get_automake_snippet "$module" | sed -e "s,lib_SOURCES,$libname"'_a_SOURCES,g' -e "s,lib_OBJECTS,$libname"'_a_OBJECTS,g'
-      if test "$module" = 'alloca'; then
-        echo "${libname}_${libext}_LIBADD += @{perhapsLT}ALLOCA@"
+      {
+        func_get_automake_snippet "$module" | sed -e "s,lib_SOURCES,${libname}_${libext}_SOURCES,g" -e "s,lib_OBJECTS,${libname}_${libext}_OBJECTS,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
+  echo
+  echo "# Makefile.am ends here"
 }
 
 # func_import modules
@@ -535,10 +549,7 @@ func_import ()
   if test -z "$dry_run"; then
     func_emit_lib_Makefile_am > $destdir/$sourcebase/Makefile.am
   else
-    echo "# $destdir/$sourcebase/Makefile.am"
     func_emit_lib_Makefile_am
-    echo
-    echo "# Makefile.am ends here"
   fi
 
   # Create gnulib.m4.
@@ -577,6 +588,12 @@ func_import ()
       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./'
+        if test "$module" = 'alloca' && test -n "$libtool"; then
+          echo 'changequote(,)dnl'
+          echo 'LTALLOCA=`echo "$ALLOCA" | sed '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`'
+          echo 'changequote([, ])dnl'
+          echo 'AC_SUBST(LTALLOCA)'
+        fi
       fi
     done
     echo "])"