[ZNC-commits] SF.net SVN: znc:[1582] trunk

[<ps...@us...>]

Revision: 1582
          http://znc.svn.sourceforge.net/znc/?rev=1582&view=rev
Author:   psychon
Date:     2009-07-26 19:38:57 +0000 (Sun, 26 Jul 2009)

Log Message:
-----------
Use @PACKAGE_VERSION@ instead of @VERSION@

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

Modified Paths:
--------------
    trunk/configure
    trunk/configure.in
    trunk/znc-config.in
    trunk/znc-uninstalled.pc.in
    trunk/znc.pc.in

Modified: trunk/configure
===================================================================
--- trunk/configure	2009-07-26 16:16:48 UTC (rev 1581)
+++ trunk/configure	2009-07-26 19:38:57 UTC (rev 1582)
@@ -601,7 +601,6 @@
 ac_unique_file="znc.cpp"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-VERSION
 DATADIR
 MODDIR
 SASL
@@ -3651,7 +3650,6 @@
 	appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\""
 fi
 
-VERSION=0.075
 
 
 
@@ -3666,8 +3664,6 @@
 
 
 
-
-
 ac_config_files="$ac_config_files Makefile"
 
 ac_config_files="$ac_config_files znc-config"

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-07-26 16:16:48 UTC (rev 1581)
+++ trunk/configure.in	2009-07-26 19:38:57 UTC (rev 1582)
@@ -233,8 +233,6 @@
 	appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\""
 fi
 
-VERSION=AC_PACKAGE_VERSION
-
 AC_SUBST([CXXFLAGS])
 AC_SUBST([CPPFLAGS])
 AC_SUBST([MODFLAGS])
@@ -249,7 +247,6 @@
 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])

Modified: trunk/znc-config.in
===================================================================
--- trunk/znc-config.in	2009-07-26 16:16:48 UTC (rev 1581)
+++ trunk/znc-config.in	2009-07-26 19:38:57 UTC (rev 1582)
@@ -14,7 +14,7 @@
 LIBS=""
 MODDIR="@MODDIR@"
 DATADIR="@DATADIR@"
-VERSION="@VERSION@"
+VERSION="@PACKAGE_VERSION@"
 
 if test -z "$1"; then
 	echo "USAGE: $0 <flag>"

Modified: trunk/znc-uninstalled.pc.in
===================================================================
--- trunk/znc-uninstalled.pc.in	2009-07-26 16:16:48 UTC (rev 1581)
+++ trunk/znc-uninstalled.pc.in	2009-07-26 19:38:57 UTC (rev 1582)
@@ -9,7 +9,7 @@
 cxx=@CXX@
 CPPFLAGS=@CPPFLAGS@
 MODFLAGS=@MODFLAGS@
-version=@VERSION@
+version=@PACKAGE_VERSION@
 moddir=@MODDIR@
 moddatadir=@DATADIR@
 modlink=@MODLINK@

Modified: trunk/znc.pc.in
===================================================================
--- trunk/znc.pc.in	2009-07-26 16:16:48 UTC (rev 1581)
+++ trunk/znc.pc.in	2009-07-26 19:38:57 UTC (rev 1582)
@@ -9,7 +9,7 @@
 cxx=@CXX@
 CPPFLAGS=@CPPFLAGS@
 MODFLAGS=@MODFLAGS@
-version=@VERSION@
+version=@PACKAGE_VERSION@
 moddir=@MODDIR@
 moddatadir=@DATADIR@
 modlink=@MODLINK@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.