From 016e547daa10eaf3351259364959f80e8f28cef1 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Mon, 31 Mar 2003 19:01:02 +0000
Subject: [PATCH] Re-corrected test for CVS version.

---
 src/ngircd/Makefile.am |  4 ++--
 src/portab/portab.h    | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/ngircd/Makefile.am b/src/ngircd/Makefile.am
index 3188f237..d3118d64 100644
--- a/src/ngircd/Makefile.am
+++ b/src/ngircd/Makefile.am
@@ -8,7 +8,7 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: Makefile.am,v 1.38 2003/03/31 15:54:21 alex Exp $
+# $Id: Makefile.am,v 1.39 2003/03/31 19:01:02 alex Exp $
 #
 
 AUTOMAKE_OPTIONS = ../portab/ansi2knr
@@ -64,7 +64,7 @@ lint:
 ngircd.c: cvs-date cvs-version.h
 
 cvs-date:
-	grep PACKAGE_VERSION ../config.h | grep "CVS" \
+	grep VERSION ../config.h | grep "CVS" \
 	 && echo "#define CVSDATE \"$$( grep "\$$Id" $(srcdir)/*.c \
 	    | $(AWK) "{ print \$$9 }" | sort | tail -1 \
 	    | sed -e "s/\//-/g" )\"" > cvs-version.new \
diff --git a/src/portab/portab.h b/src/portab/portab.h
index c911613c..dc0a4f92 100644
--- a/src/portab/portab.h
+++ b/src/portab/portab.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: portab.h,v 1.14 2003/03/17 01:12:10 alex Exp $
+ * $Id: portab.h,v 1.15 2003/03/31 19:01:02 alex Exp $
  *
  * Portability functions and declarations (header for libngbportab).
  */
@@ -146,6 +146,14 @@ EXTERN size_t strlcpy PARAMS(( CHAR *dst, CONST CHAR *src, size_t size ));
 EXTERN INT vsnprintf PARAMS(( CHAR *str, size_t count, CONST CHAR *fmt, va_list args ));
 #endif
 
+#ifndef PACKAGE_NAME
+#define PACKAGE_NAME PACKAGE
+#endif
+
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION VERSION
+#endif
+
 
 #endif