2003-09-24 Paul Jakma <paul@dishone.st>
* lib/version.h: moved to version.h.in
* lib/version.h.in: New file, from version.h. Change hardcoded
package name and version to use the autoconf defined substition
variables.
* configure.ac: Fix up AC/AM_INIT* to new style. Remove the sed'ing
through lib/version.h for VERSION. Add lib/version.h to the
AC_OUTPUT list. Update the text output of quagga version at end
of configure run to use PACKAGE_VERSION.
* doc/.cvsignore: ignore quagga.pdf
* doc/.cvsignore: ignore version.h, its now autogenerated.
diff --git a/configure.ac b/configure.ac
index fe8e311..23f7b0a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,9 @@
##
AC_PREREQ(2.53)
-AC_INIT(lib/zebra.h)
-AM_INIT_AUTOMAKE(quagga, 0.96.2)
+AC_INIT(quagga, 0.96.2, [bug-zebra@gnu.org])
+AC_CONFIG_SRCDIR(lib/zebra.h)
+AM_INIT_AUTOMAKE()
AM_CONFIG_HEADER(config.h)
dnl -----------------------------------
@@ -935,13 +936,6 @@
)
fi
-dnl -------------
-dnl check version
-dnl -------------
-file="${srcdir}/lib/version.h"
-VERSION=`sed -ne 's/^#.*QUAGGA_VERSION.*\"\([^\"]*\)\"$/\1/p' $file`
-AC_SUBST(VERSION)
-
dnl ----------
dnl configure date
dnl ----------
@@ -1015,12 +1009,13 @@
ripngd/Makefile bgpd/Makefile ospfd/Makefile
ospf6d/Makefile vtysh/Makefile doc/Makefile
ospfclient/Makefile
- redhat/quagga.spec)
+ redhat/quagga.spec
+ lib/version.h)
echo "
zebra configuration
-------------------
-quagga version : ${VERSION}
+quagga version : ${PACKAGE_VERSION}
host operationg system : ${host_os}
source code location : ${srcdir}
compiler : ${CC}
diff --git a/doc/.cvsignore b/doc/.cvsignore
index 52e888a..a12ecd8 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -5,3 +5,4 @@
zebra.html
quagga.info*
quagga.html
+quagga.pdf
diff --git a/lib/.cvsignore b/lib/.cvsignore
index b8e258b..d95f62f 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -2,4 +2,5 @@
Makefile.in
*.o
version.c
+version.h
.deps
diff --git a/lib/version.h b/lib/version.h.in
similarity index 85%
rename from lib/version.h
rename to lib/version.h.in
index 9280613..8b8b9f6 100644
--- a/lib/version.h
+++ b/lib/version.h.in
@@ -22,13 +22,13 @@
#ifndef _ZEBRA_VERSION_H
#define _ZEBRA_VERSION_H
-#define QUAGGA_PROGNAME "quagga"
+#define QUAGGA_PROGNAME "@PACKAGE_NAME@"
-#define QUAGGA_VERSION "0.96.2"
+#define QUAGGA_VERSION "@PACKAGE_VERSION@"
-#define ZEBRA_BUG_ADDRESS "bug-zebra@gnu.org"
+#define ZEBRA_BUG_ADDRESS "@PACKAGE_BUGREPORT@"
-#define ZEBRA_URL "http://www.quagga.net"
+#define QUAGGA_URL "http://www.quagga.net"
extern char *host_name;