prepare for 3.2 release

Fall back to using libnl-*.3.pc files. It may be common to have multiple
generations of libnl installed but unlikely within the same major release.

diff --git a/Makefile.am b/Makefile.am
index 644fdb1da6d75037d42fe353413876339b12d98b..e152685a7ed49e7f3d3a476b1510e8b407482f1a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,10 +10,10 @@ endif
 
 SUBDIRS = include lib doc man python $(OPT_DIRS)
 
-pkgconfig_DATA = libnl-3.1.pc \
-                libnl-route-3.1.pc \
-                libnl-genl-3.1.pc \
-                libnl-nf-3.1.pc
+pkgconfig_DATA = libnl-3.pc \
+                libnl-route-3.pc \
+                libnl-genl-3.pc \
+                libnl-nf-3.pc
 
 sysconfdir = @sysconfdir@/libnl
 sysconf_DATA = etc/pktloc etc/classid

diff --git a/configure.in b/configure.in
index 3406530651e64825a3a28eef02567e08d3d6e51d..4eb54203fc9ed85d614b2cebf9db5b29e8839d2c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@
 # Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
 #
 
-AC_INIT(libnl, 3.1, tgraf@suug.ch)
+AC_INIT(libnl, 3.2, tgraf@suug.ch)
 AC_CONFIG_HEADERS([lib/defs.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
@@ -17,7 +17,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)], [])
 
 MAJ_VERSION=3
 AC_SUBST([MAJ_VERSION])
-MIN_VERSION=1
+MIN_VERSION=2
 AC_SUBST([MIN_VERSION])
 
 AC_PROG_CC
@@ -45,7 +45,7 @@ AC_CHECK_LIB([pthread], [pthread_mutex_lock], [], AC_MSG_ERROR([libpthread is re
 
 AC_CONFIG_FILES([Makefile doc/Doxyfile doc/Makefile lib/Makefile
        include/Makefile src/Makefile src/lib/Makefile man/Makefile
-       libnl-3.1.pc libnl-route-3.1.pc libnl-genl-3.1.pc libnl-nf-3.1.pc
+       libnl-3.pc libnl-route-3.pc libnl-genl-3.pc libnl-nf-3.pc
        python/Makefile python/setup.py python/netlink/Makefile
        python/netlink/route/Makefile
        include/netlink/version.h])

diff --git a/libnl-3.1.pc.in b/libnl-3.pc.in
similarity index 100%
rename from libnl-3.1.pc.in
rename to libnl-3.pc.in

diff --git a/libnl-genl-3.1.pc.in b/libnl-genl-3.pc.in
similarity index 92%
rename from libnl-genl-3.1.pc.in
rename to libnl-genl-3.pc.in
index 5b5f841861cadd917d25618fdd2bc188d528d816..216755942cda910cd755cefffacf30c4e705b94a 100644 (file)
--- a/libnl-genl-3.1.pc.in
+++ b/libnl-genl-3.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libnl-genl
 Description: Generic Netlink Library
 Version: @PACKAGE_VERSION@
-Requires: libnl
+Requires: libnl-3
 Libs: -L${libdir} -lnl-genl
 Cflags: -I${includedir}

diff --git a/libnl-nf-3.1.pc.in b/libnl-nf-3.pc.in
similarity index 92%
rename from libnl-nf-3.1.pc.in
rename to libnl-nf-3.pc.in
index ffff22be7b5b71814ef9b06a61cbc6bc94e9bcea..0ec9100796467b9b85973b6519f295ee23f20fe5 100644 (file)
--- a/libnl-nf-3.1.pc.in
+++ b/libnl-nf-3.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libnl-nf
 Description: Netfilter Netlink Library
 Version: @PACKAGE_VERSION@
-Requires: libnl
+Requires: libnl-3
 Libs: -L${libdir} -lnl-nf
 Cflags: -I${includedir}

diff --git a/libnl-route-3.1.pc.in b/libnl-route-3.pc.in
similarity index 92%
rename from libnl-route-3.1.pc.in
rename to libnl-route-3.pc.in
index 95be862e08d17d7e7d75d2affb9caefcc042e5d2..217f6c28e1dd537962ca4e54a6f089da62c4d01e 100644 (file)
--- a/libnl-route-3.1.pc.in
+++ b/libnl-route-3.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libnl-route
 Description: Netlink Routing Family Library
 Version: @PACKAGE_VERSION@
-Requires: libnl
+Requires: libnl-3
 Libs: -L${libdir} -lnl-route
 Cflags: -I${includedir}