Mercurial > hg > octave-kai > gnulib-hg
changeset 5237:bd85db908172
Replace various ad-hoc automake/autoconf/aclocal
calls with autoreconf. Define GL_LIB.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Sun, 19 Sep 2004 02:08:45 +0000 |
parents | e004d4ef0700 |
children | ea357a6f13d3 |
files | gnulib-tool |
diffstat | 1 files changed, 9 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/gnulib-tool +++ b/gnulib-tool @@ -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 @@ ;; 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 @@ # 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 @@ # 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 @@ 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."