[Bug-gnulib] gnulib-tool fix

[Simon Josefsson]

This was lost within an old thread.  How about it?  The GL_LIB part is
necessary for --import to work, the other seem like general cleanups.

2004-08-23  Simon Josefsson  <address@hidden>

        * gnulib-tool: Replace various ad-hoc automake/autoconf/aclocal
        calls with autoreconf.  Define GL_LIB.

Index: gnulib-tool
===================================================================
RCS file: /cvsroot/gnulib/gnulib/gnulib-tool,v
retrieving revision 1.15
diff -u -p -u -w -r1.15 gnulib-tool
--- gnulib-tool 17 Aug 2004 23:36:21 -0000      1.15
+++ gnulib-tool 16 Sep 2004 14:39:10 -0000
@@ -26,19 +26,7 @@ cvsdatestamp='$Date: 2004/08/17 23:36:21
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
-# You can set AUTOCONFPATH to empty if autoconf 2.57 is already in your PATH.
-AUTOCONFPATH=
-case $USER in
-  bruno )
-    AUTOCONFBINDIR=/packages/gnu-inst-autoconf/2.57/bin
-    AUTOCONFPATH="eval env PATH=${AUTOCONFBINDIR}:\$PATH "
-    ;;
-esac
-
-AUTOCONF="${AUTOCONFPATH}autoconf"
-AUTOHEADER="${AUTOCONFPATH}autoheader"
-AUTOMAKE="${AUTOCONFPATH}automake-1.7"
-ACLOCAL="aclocal-1.7"
+AUTORECONF="${AUTOCONFPATH}${AUTORECONF:-autoreconf}"
 
 # func_usage
 # outputs to stdout the --help usage message.
@@ -499,14 +487,8 @@ func_create_testdir ()
 
   # Create autogenerated files.
   (cd "$testdir"
-   echo "executing ${ACLOCAL} -I m4"
-   ${ACLOCAL} -I m4
-   echo "executing ${AUTOHEADER}"
-   ${AUTOHEADER}
-   echo "executing ${AUTOCONF}"
-   ${AUTOCONF}
-   echo "executing ${AUTOMAKE} --add-missing --copy"
-   ${AUTOMAKE} --add-missing --copy
+   echo "executing ${AUTORECONF} --force --install"
+   ${AUTORECONF} --force --install
   )
   if grep '^BUILT_SOURCES *+=' "$testdir/lib/Makefile.am" > /dev/null; then
     (cd "$testdir"
@@ -564,12 +546,8 @@ func_create_megatestdir ()
 
   # Create autogenerated files.
   (cd "$megatestdir"
-   echo "executing ${ACLOCAL}"
-   ${ACLOCAL}
-   echo "executing ${AUTOCONF}"
-   ${AUTOCONF}
-   echo "executing ${AUTOMAKE} --add-missing --copy Makefile"
-   ${AUTOMAKE} --add-missing --copy Makefile
+   echo "executing ${AUTORECONF} --force --install"
+   ${AUTORECONF} --force --install
   )
 }
 
@@ -807,6 +785,9 @@ case $mode in
            echo "dnl Usage: gl_M4_BASE(DIR)"
            echo "AC_DEFUN([gl_M4_BASE], [])"
            echo
+           echo "dnl Usage: gl_LIB(LIBNAME)"
+           echo "AC_DEFUN([gl_LIB], [])"
+           echo
            echo "# gnulib.m4 ends here"
        )
        echo "Finished."