From fa1253d0c95416ab0361e6945275ef8194fd7ddd Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 24 Sep 2003 05:09:26 +0000 Subject: 2003-09-24 Paul Jakma * 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. --- configure.ac | 17 ++++++----------- doc/.cvsignore | 1 + lib/.cvsignore | 1 + lib/version.h | 43 ------------------------------------------- lib/version.h.in | 43 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+), 54 deletions(-) delete mode 100644 lib/version.h create mode 100644 lib/version.h.in diff --git a/configure.ac b/configure.ac index fe8e311f..23f7b0a1 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 @@ if test x"${ac_cv_header_execinfo_h}" = x"yes"; then ) 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 @@ AC_OUTPUT(Makefile lib/Makefile zebra/Makefile ripd/Makefile 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 52e888ad..a12ecd85 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -5,3 +5,4 @@ zebra.info-* zebra.html quagga.info* quagga.html +quagga.pdf diff --git a/lib/.cvsignore b/lib/.cvsignore index b8e258be..d95f62f7 100644 --- a/lib/.cvsignore +++ b/lib/.cvsignore @@ -2,4 +2,5 @@ Makefile Makefile.in *.o version.c +version.h .deps diff --git a/lib/version.h b/lib/version.h deleted file mode 100644 index 9280613d..00000000 --- a/lib/version.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Zebra version - * Copyright (C) 1997, 1999 Kunihiro Ishiguro - * - * This file is part of GNU Zebra. - * - * GNU Zebra is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2, or (at your option) any - * later version. - * - * GNU Zebra is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Zebra; see the file COPYING. If not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#ifndef _ZEBRA_VERSION_H -#define _ZEBRA_VERSION_H - -#define QUAGGA_PROGNAME "quagga" - -#define QUAGGA_VERSION "0.96.2" - -#define ZEBRA_BUG_ADDRESS "bug-zebra@gnu.org" - -#define ZEBRA_URL "http://www.quagga.net" - -extern char *host_name; - -void print_version(char *); -pid_t pid_output (char *); -pid_t pid_output_lock (char *); - -#ifndef HAVE_DAEMON -int daemon(int, int); -#endif - -#endif /* _ZEBRA_VERSION_H */ diff --git a/lib/version.h.in b/lib/version.h.in new file mode 100644 index 00000000..8b8b9f6e --- /dev/null +++ b/lib/version.h.in @@ -0,0 +1,43 @@ +/* Zebra version + * Copyright (C) 1997, 1999 Kunihiro Ishiguro + * + * This file is part of GNU Zebra. + * + * GNU Zebra is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2, or (at your option) any + * later version. + * + * GNU Zebra is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Zebra; see the file COPYING. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef _ZEBRA_VERSION_H +#define _ZEBRA_VERSION_H + +#define QUAGGA_PROGNAME "@PACKAGE_NAME@" + +#define QUAGGA_VERSION "@PACKAGE_VERSION@" + +#define ZEBRA_BUG_ADDRESS "@PACKAGE_BUGREPORT@" + +#define QUAGGA_URL "http://www.quagga.net" + +extern char *host_name; + +void print_version(char *); +pid_t pid_output (char *); +pid_t pid_output_lock (char *); + +#ifndef HAVE_DAEMON +int daemon(int, int); +#endif + +#endif /* _ZEBRA_VERSION_H */ -- cgit v1.2.1