[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Bug-gnulib] gnulib-tool fix
From: |
Paul Eggert |
Subject: |
Re: [Bug-gnulib] gnulib-tool fix |
Date: |
Sat, 18 Sep 2004 19:11:47 -0700 |
User-agent: |
Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux) |
Simon Josefsson <address@hidden> writes:
> This was lost within an old thread. How about it?
Thanks. That patch removed some Bruno-specific stuff that I'd rather
not mess with without Bruno looking at it first (also, it wasn't in
the proposed changelog entry). The other stuff looked OK, though, so
I installed this more-conservative patch.
2004-09-18 Simon Josefsson <address@hidden>
and Paul Eggert <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
retrieving revision 1.16
diff -p -u -r1.15 -r1.16
--- gnulib-tool 17 Aug 2004 23:36:21 -0000 1.15
+++ gnulib-tool 19 Sep 2004 02:08:45 -0000 1.16
@@ -22,7 +22,7 @@
progname=$0
package=gnulib
-cvsdatestamp='$Date: 2004/08/17 23:36:21 $'
+cvsdatestamp='$Date: 2004/09/19 02:08:45 $'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
@@ -35,10 +35,7 @@ case $USER in
;;
esac
-AUTOCONF="${AUTOCONFPATH}autoconf"
-AUTOHEADER="${AUTOCONFPATH}autoheader"
-AUTOMAKE="${AUTOCONFPATH}automake-1.7"
-ACLOCAL="aclocal-1.7"
+AUTORECONF="${AUTOCONFPATH}autoreconf"
# func_usage
# outputs to stdout the --help usage message.
@@ -499,14 +496,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 +555,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 +794,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."