comparison gnulib-tool @ 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 64446bf39961
children 46a747db97f2
comparison
equal deleted inserted replaced
5236:e004d4ef0700 5237:bd85db908172
20 # This program is meant for authors or maintainers which want to import 20 # This program is meant for authors or maintainers which want to import
21 # modules from gnulib into their packages. 21 # modules from gnulib into their packages.
22 22
23 progname=$0 23 progname=$0
24 package=gnulib 24 package=gnulib
25 cvsdatestamp='$Date: 2004-08-17 23:36:21 $' 25 cvsdatestamp='$Date: 2004-09-19 02:08:45 $'
26 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` 26 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
27 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` 27 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
28 28
29 # You can set AUTOCONFPATH to empty if autoconf 2.57 is already in your PATH. 29 # You can set AUTOCONFPATH to empty if autoconf 2.57 is already in your PATH.
30 AUTOCONFPATH= 30 AUTOCONFPATH=
33 AUTOCONFBINDIR=/packages/gnu-inst-autoconf/2.57/bin 33 AUTOCONFBINDIR=/packages/gnu-inst-autoconf/2.57/bin
34 AUTOCONFPATH="eval env PATH=${AUTOCONFBINDIR}:\$PATH " 34 AUTOCONFPATH="eval env PATH=${AUTOCONFBINDIR}:\$PATH "
35 ;; 35 ;;
36 esac 36 esac
37 37
38 AUTOCONF="${AUTOCONFPATH}autoconf" 38 AUTORECONF="${AUTOCONFPATH}autoreconf"
39 AUTOHEADER="${AUTOCONFPATH}autoheader"
40 AUTOMAKE="${AUTOCONFPATH}automake-1.7"
41 ACLOCAL="aclocal-1.7"
42 39
43 # func_usage 40 # func_usage
44 # outputs to stdout the --help usage message. 41 # outputs to stdout the --help usage message.
45 func_usage () 42 func_usage ()
46 { 43 {
497 echo "AC_OUTPUT([$makefiles])" 494 echo "AC_OUTPUT([$makefiles])"
498 ) > "$testdir/configure.ac" 495 ) > "$testdir/configure.ac"
499 496
500 # Create autogenerated files. 497 # Create autogenerated files.
501 (cd "$testdir" 498 (cd "$testdir"
502 echo "executing ${ACLOCAL} -I m4" 499 echo "executing ${AUTORECONF} --force --install"
503 ${ACLOCAL} -I m4 500 ${AUTORECONF} --force --install
504 echo "executing ${AUTOHEADER}"
505 ${AUTOHEADER}
506 echo "executing ${AUTOCONF}"
507 ${AUTOCONF}
508 echo "executing ${AUTOMAKE} --add-missing --copy"
509 ${AUTOMAKE} --add-missing --copy
510 ) 501 )
511 if grep '^BUILT_SOURCES *+=' "$testdir/lib/Makefile.am" > /dev/null; then 502 if grep '^BUILT_SOURCES *+=' "$testdir/lib/Makefile.am" > /dev/null; then
512 (cd "$testdir" 503 (cd "$testdir"
513 ./configure 504 ./configure
514 cd lib 505 cd lib
562 echo "AC_OUTPUT([Makefile])" 553 echo "AC_OUTPUT([Makefile])"
563 ) > "$megatestdir/configure.ac" 554 ) > "$megatestdir/configure.ac"
564 555
565 # Create autogenerated files. 556 # Create autogenerated files.
566 (cd "$megatestdir" 557 (cd "$megatestdir"
567 echo "executing ${ACLOCAL}" 558 echo "executing ${AUTORECONF} --force --install"
568 ${ACLOCAL} 559 ${AUTORECONF} --force --install
569 echo "executing ${AUTOCONF}"
570 ${AUTOCONF}
571 echo "executing ${AUTOMAKE} --add-missing --copy Makefile"
572 ${AUTOMAKE} --add-missing --copy Makefile
573 ) 560 )
574 } 561 }
575 562
576 case $mode in 563 case $mode in
577 "" ) 564 "" )
805 echo "AC_DEFUN([gl_SOURCE_BASE], [])" 792 echo "AC_DEFUN([gl_SOURCE_BASE], [])"
806 echo 793 echo
807 echo "dnl Usage: gl_M4_BASE(DIR)" 794 echo "dnl Usage: gl_M4_BASE(DIR)"
808 echo "AC_DEFUN([gl_M4_BASE], [])" 795 echo "AC_DEFUN([gl_M4_BASE], [])"
809 echo 796 echo
797 echo "dnl Usage: gl_LIB(LIBNAME)"
798 echo "AC_DEFUN([gl_LIB], [])"
799 echo
810 echo "# gnulib.m4 ends here" 800 echo "# gnulib.m4 ends here"
811 ) 801 )
812 echo "Finished." 802 echo "Finished."
813 echo 803 echo
814 echo "Don't forget to add \"$sourcebase/Makefile\"" 804 echo "Don't forget to add \"$sourcebase/Makefile\""