From 16372a58304f0e68cb10e95192771b1bc5446d10 Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Sun, 26 Jul 2009 19:38:57 +0000
Subject: [PATCH] Use @PACKAGE_VERSION@ instead of @VERSION@

autoconf automatically substitutes @PACKAGE_VERSION@, so there is not much point
into adding another substitute for this.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1582 726aef4b-f618-498e-8847-2d620e286838
---
 configure             | 4 ----
 configure.in          | 3 ---
 znc-config.in         | 2 +-
 znc-uninstalled.pc.in | 2 +-
 znc.pc.in             | 2 +-
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 303d6ba2..6dfab392 100755
--- a/configure
+++ b/configure
@@ -601,7 +601,6 @@ PACKAGE_BUGREPORT=''
 ac_unique_file="znc.cpp"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-VERSION
 DATADIR
 MODDIR
 SASL
@@ -3651,9 +3650,6 @@ fi
 	appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\""
 fi
 
-VERSION=0.075
-
-
 
 
 
diff --git a/configure.in b/configure.in
index a6e33c77..acad0162 100644
--- a/configure.in
+++ b/configure.in
@@ -233,8 +233,6 @@ if test "$MODULES" = "yes"; then
 	appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\""
 fi
 
-VERSION=AC_PACKAGE_VERSION
-
 AC_SUBST([CXXFLAGS])
 AC_SUBST([CPPFLAGS])
 AC_SUBST([MODFLAGS])
@@ -249,7 +247,6 @@ AC_SUBST([PERL])
 AC_SUBST([SASL])
 AC_SUBST([MODDIR])
 AC_SUBST([DATADIR])
-AC_SUBST([VERSION])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([znc-config])
 AC_CONFIG_FILES([znc-buildmod])
diff --git a/znc-config.in b/znc-config.in
index dd6e2715..0640bb86 100755
--- a/znc-config.in
+++ b/znc-config.in
@@ -14,7 +14,7 @@ MODLINK="@MODLINK@"
 LIBS=""
 MODDIR="@MODDIR@"
 DATADIR="@DATADIR@"
-VERSION="@VERSION@"
+VERSION="@PACKAGE_VERSION@"
 
 if test -z "$1"; then
 	echo "USAGE: $0 <flag>"
diff --git a/znc-uninstalled.pc.in b/znc-uninstalled.pc.in
index d3e0e387..73570abb 100644
--- a/znc-uninstalled.pc.in
+++ b/znc-uninstalled.pc.in
@@ -9,7 +9,7 @@ includedir=@includedir@
 cxx=@CXX@
 CPPFLAGS=@CPPFLAGS@
 MODFLAGS=@MODFLAGS@
-version=@VERSION@
+version=@PACKAGE_VERSION@
 moddir=@MODDIR@
 moddatadir=@DATADIR@
 modlink=@MODLINK@
diff --git a/znc.pc.in b/znc.pc.in
index 47286781..c4588bea 100644
--- a/znc.pc.in
+++ b/znc.pc.in
@@ -9,7 +9,7 @@ includedir=@includedir@
 cxx=@CXX@
 CPPFLAGS=@CPPFLAGS@
 MODFLAGS=@MODFLAGS@
-version=@VERSION@
+version=@PACKAGE_VERSION@
 moddir=@MODDIR@
 moddatadir=@DATADIR@
 modlink=@MODLINK@