- release 2 (rebuild after libnl soname change)

[packages/net-snmp.git] / net-snmp-rpm-implicit-libs.patch

diff --git a/net-snmp-rpm-implicit-libs.patch b/net-snmp-rpm-implicit-libs.patch
index d00f156e4d0387157dec510d4b5b017dedea6b0c..0aa61c0edd1efdbe1d9c664993b533aee9d5969a 100644 (file)
--- a/net-snmp-rpm-implicit-libs.patch
+++ b/net-snmp-rpm-implicit-libs.patch
@@ -1,24 +1,12 @@
-diff -ur net-snmp-5.3.org/configure.in net-snmp-5.3/configure.in
---- net-snmp-5.3.org/configure.in      2005-12-28 18:20:56.000000000 +0100
-+++ net-snmp-5.3/configure.in  2006-01-09 00:57:24.173063750 +0100
-@@ -2396,20 +2396,6 @@
-   ])
+--- net-snmp-5.7/configure.d/config_os_libs1~  2011-07-02 00:35:46.000000000 +0200
++++ net-snmp-5.7/configure.d/config_os_libs1   2011-07-30 21:24:38.780738542 +0200
+@@ -33,9 +33,6 @@
+   # FWIW librpm.la, librpmio.la, and libpopt.la have correct dependencies.
+   _rpmlibs=""
  
- 
--  # two variants of db1 need checking.
--  AC_CHECK_LIB(db1, dbopen, [_rpmlibs="-ldb1 $_rpmlibs"],
--     AC_CHECK_LIB(db, dbopen, [_rpmlibs="-ldb $_rpmlibs"]))
--
--  # two variants of db3 need checking.
--  AC_CHECK_LIB(db-3.1, db_create, [_rpmlibs="-ldb-3.1 $_rpmlibs"],
--    AC_CHECK_LIB(db-3.0, db_create, [_rpmlibs="-ldb-3.0 $_rpmlibs"]))
--  
--  # rpm-3.0.5 and later needs popt.
--  AC_CHECK_LIB(popt, poptParseArgvString, [_rpmlibs="-lpopt $_rpmlibs"])
--  
 -  # rpm-4.0.x needs rpmio.
--  AC_CHECK_LIB(rpmio, Fopen, [_rpmlibs="-lrpmio $_rpmlibs"],,$_rpmlibs)
+-  NETSNMP_SEARCH_LIBS(rpmGetPath, rpmio,,, $LMIBLIBS, _rpmlibs)
 -  
+   # rpm-4.0.3 librpmdb actually contains what we need.
+   NETSNMP_SEARCH_LIBS(rpmdbOpen, rpmdb,,, $LMIBLIBS, _rpmlibs)
    # now check for rpm using the appropriate libraries.
-   AC_CHECK_LIB(rpm, rpmGetFilesystemList,[
-     AC_DEFINE(HAVE_LIBRPM)