Permalink
Browse files

2007-01-12 Al Riddoch <alriddoch@zepler.org>

	* configure.ac: Increment version number. Remove conflicts, as
	  we don't really have a conflict.

	* varconf-1.0.pc.in: Don't conflict with earlier versions of sigc++.
  • Loading branch information...
1 parent bd37f93 commit 44c5876394e671f7ffb58ae4a3288e1221b07611 @alriddoch alriddoch committed Jan 12, 2007
Showing with 14 additions and 7 deletions.
  1. +7 −0 ChangeLog
  2. +4 −0 NEWS
  3. +3 −6 configure.ac
  4. +0 −1 varconf-1.0.pc.in
View
@@ -1,3 +1,10 @@
+2007-01-12 Al Riddoch <alriddoch@zepler.org>
+
+ * configure.ac: Increment version number. Remove conflicts, as
+ we don't really have a conflict.
+
+ * varconf-1.0.pc.in: Don't conflict with earlier versions of sigc++.
+
2006-10-12 Al Riddoch <alriddoch@zepler.org>
* varconf/Config.h, varconf/config.cpp, varconf/dynbase.cpp,
View
4 NEWS
@@ -1,3 +1,7 @@
+2007-01-12 Al Riddoch <alriddoch@zepler.org>
+
+ * varconf 0.6.5 released.
+
2006-01-16 Al Riddoch <alriddoch@zepler.org>
* varconf 0.6.4 released.
View
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to generate configure
dnl Autoconf Initialization
-AC_INIT(varconf, 0.6.4, alriddoch@zepler.org)
+AC_INIT(varconf, 0.6.5, alriddoch@zepler.org)
AC_CONFIG_SRCDIR([varconf/variable.cpp])
AC_CONFIG_HEADERS([config.h])
@@ -11,17 +11,16 @@ AC_CANONICAL_HOST
dnl Information
-AM_INIT_AUTOMAKE([dist-bzip2 check-news])
+AM_INIT_AUTOMAKE([nostdinc dist-bzip2 check-news])
dnl versioning info for libtool
VARCONF_CURRENT=6
VARCONF_REVISION=0
VARCONF_AGE=0
VARCONF_REQUIRES=""
-VARCONF_CONFLICTS=""
VARCONF_LIB_SUFFIX="-1.0"
-MIN_SIGC_VERSION=1.2.0
+MIN_SIGC_VERSION=2.0.0
dnl General Initialization
@@ -56,7 +55,6 @@ PKG_CHECK_MODULES(SIGC, sigc++-2.0 >= $MIN_SIGC_VERSION,
CPPFLAGS="$CPPFLAGS $SIGC_CFLAGS"
LDFLAGS="$LDFLAGS $SIGC_LIBS"
VARCONF_REQUIRES="$VARCONF_REQUIRES sigc++-2.0"
- VARCONF_CONFLICTS="$VARCONF_CONFLICTS sigc++-1.2 < 2.0"
],
AC_MSG_ERROR([Couldn't find sigc++ library!])
])
@@ -66,7 +64,6 @@ VARCONF_VERSION_INFO=$VARCONF_CURRENT:$VARCONF_REVISION:$VARCONF_AGE
AC_SUBST(VARCONF_LIBS)
AC_SUBST(VARCONF_REQUIRES)
-AC_SUBST(VARCONF_CONFLICTS)
AC_SUBST(VARCONF_VERSION_INFO)
AC_SUBST(VARCONF_LIB_SUFFIX)
AC_SUBST(MIN_SIGC_VERSION)
View
@@ -6,7 +6,6 @@ includedir=@includedir@
Name: @PACKAGE@
Description: A config handling library.
Requires: @VARCONF_REQUIRES@
-Conflicts: @VARCONF_CONFLICTS@
Version: @VERSION@
Libs: -L${libdir} @VARCONF_LIBS@
Cflags: -I${includedir}/varconf@VARCONF_LIB_SUFFIX@

0 comments on commit 44c5876

Please sign in to comment.