diff options
| author | Thomas Graf <tgraf@infradead.org> | 2011-09-08 15:00:07 +0200 |
|---|---|---|
| committer | Thomas Graf <tgraf@infradead.org> | 2011-09-08 15:34:31 +0200 |
| commit | 2a37ab5f34fcbe97aee8cabeb3b85f96751999af (patch) | |
| tree | 1889292350415ea3cde4a057a22a82e72763aa38 | |
| parent | 80569bb24235749e1bd7a611ece363db03f1617f (diff) | |
| download | libnl-2a37ab5f34fcbe97aee8cabeb3b85f96751999af.tar.gz | |
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.
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | libnl-3.pc.in (renamed from libnl-3.1.pc.in) | 0 | ||||
| -rw-r--r-- | libnl-genl-3.pc.in (renamed from libnl-genl-3.1.pc.in) | 2 | ||||
| -rw-r--r-- | libnl-nf-3.pc.in (renamed from libnl-nf-3.1.pc.in) | 2 | ||||
| -rw-r--r-- | libnl-route-3.pc.in (renamed from libnl-route-3.1.pc.in) | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 644fdb1..e152685 100644 --- 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 3406530..4eb5420 100644 --- 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 index e44f0fb..e44f0fb 100644 --- a/libnl-3.1.pc.in +++ b/libnl-3.pc.in diff --git a/libnl-genl-3.1.pc.in b/libnl-genl-3.pc.in index 5b5f841..2167559 100644 --- 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 index ffff22b..0ec9100 100644 --- 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 index 95be862..217f6c2 100644 --- 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} |