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.
This commit is contained in:
parent
80569bb242
commit
2a37ab5f34
|
@ -10,10 +10,10 @@ endif
|
||||||
|
|
||||||
SUBDIRS = include lib doc man python $(OPT_DIRS)
|
SUBDIRS = include lib doc man python $(OPT_DIRS)
|
||||||
|
|
||||||
pkgconfig_DATA = libnl-3.1.pc \
|
pkgconfig_DATA = libnl-3.pc \
|
||||||
libnl-route-3.1.pc \
|
libnl-route-3.pc \
|
||||||
libnl-genl-3.1.pc \
|
libnl-genl-3.pc \
|
||||||
libnl-nf-3.1.pc
|
libnl-nf-3.pc
|
||||||
|
|
||||||
sysconfdir = @sysconfdir@/libnl
|
sysconfdir = @sysconfdir@/libnl
|
||||||
sysconf_DATA = etc/pktloc etc/classid
|
sysconf_DATA = etc/pktloc etc/classid
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
# Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
|
# 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_HEADERS([lib/defs.h])
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
|
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
|
||||||
|
@ -17,7 +17,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)], [])
|
||||||
|
|
||||||
MAJ_VERSION=3
|
MAJ_VERSION=3
|
||||||
AC_SUBST([MAJ_VERSION])
|
AC_SUBST([MAJ_VERSION])
|
||||||
MIN_VERSION=1
|
MIN_VERSION=2
|
||||||
AC_SUBST([MIN_VERSION])
|
AC_SUBST([MIN_VERSION])
|
||||||
|
|
||||||
AC_PROG_CC
|
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
|
AC_CONFIG_FILES([Makefile doc/Doxyfile doc/Makefile lib/Makefile
|
||||||
include/Makefile src/Makefile src/lib/Makefile man/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/Makefile python/setup.py python/netlink/Makefile
|
||||||
python/netlink/route/Makefile
|
python/netlink/route/Makefile
|
||||||
include/netlink/version.h])
|
include/netlink/version.h])
|
||||||
|
|
|
@ -6,6 +6,6 @@ includedir=@includedir@
|
||||||
Name: libnl-genl
|
Name: libnl-genl
|
||||||
Description: Generic Netlink Library
|
Description: Generic Netlink Library
|
||||||
Version: @PACKAGE_VERSION@
|
Version: @PACKAGE_VERSION@
|
||||||
Requires: libnl
|
Requires: libnl-3
|
||||||
Libs: -L${libdir} -lnl-genl
|
Libs: -L${libdir} -lnl-genl
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
|
@ -6,6 +6,6 @@ includedir=@includedir@
|
||||||
Name: libnl-nf
|
Name: libnl-nf
|
||||||
Description: Netfilter Netlink Library
|
Description: Netfilter Netlink Library
|
||||||
Version: @PACKAGE_VERSION@
|
Version: @PACKAGE_VERSION@
|
||||||
Requires: libnl
|
Requires: libnl-3
|
||||||
Libs: -L${libdir} -lnl-nf
|
Libs: -L${libdir} -lnl-nf
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
|
@ -6,6 +6,6 @@ includedir=@includedir@
|
||||||
Name: libnl-route
|
Name: libnl-route
|
||||||
Description: Netlink Routing Family Library
|
Description: Netlink Routing Family Library
|
||||||
Version: @PACKAGE_VERSION@
|
Version: @PACKAGE_VERSION@
|
||||||
Requires: libnl
|
Requires: libnl-3
|
||||||
Libs: -L${libdir} -lnl-route
|
Libs: -L${libdir} -lnl-route
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
Reference in New Issue