Browse Source

2004-08-19 Paul Jakma <paul@dishone.st>

        * Makefile.am: add m4 directory to EXTRA_DIST, and define
          ACLOCAL_AMFLAGS to have aclocal pull in m4/
        * configure.ac: AM_PROG_LIBTOOL should be AC_PROG_LIBTOOL
        * update-autotools: print a warning that this script is deprecated
paul 15 years ago
parent
commit
0fc42949a4
3 changed files with 9 additions and 3 deletions
  1. 4 1
      Makefile.am
  2. 2 2
      configure.ac
  3. 3 0
      update-autotools

+ 4 - 1
Makefile.am

@@ -9,4 +9,7 @@ DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d \
 EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
 	vtysh/Makefile.am update-autotools \
 	tools/mrlg.cgi tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \
-	tools/zebra.el 
+	tools/zebra.el m4
+	
+
+ACLOCAL_AMFLAGS = -I m4

+ 2 - 2
configure.ac

@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.58 2004/07/26 19:27:51 paul Exp $
+## $Id: configure.ac,v 1.59 2004/08/19 04:41:21 paul Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(quagga, 0.96.5, [http://bugzilla.quagga.net])
@@ -70,7 +70,7 @@ AC_AIX
 dnl -------
 dnl libtool
 dnl -------
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 dnl ----------------------
 dnl Packages configuration

+ 3 - 0
update-autotools

@@ -7,6 +7,9 @@
 rm -f config.cache Makefile.in aclocal.m4 config.h.in configure
 rm -rf autom4te.cache
 
+echo "This $0 script is deprecated, and will be removed at some stage."
+echo "Please use the 'autoreconf' command included with autoconf."
+
 echo "TOOLS VERIONS:"
 for tool in autoheader autoconf libtool libtoolize aclocal automake; do
   $tool --version | head -1