- partial update to 5.5

[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..731916ef234d462a03ec1321165d40ffb4a8df0c 100644 (file)
--- a/net-snmp-rpm-implicit-libs.patch
+++ b/net-snmp-rpm-implicit-libs.patch
@@ -1,24 +1,21 @@
-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.5/configure.d/config_os_libs~   2009-07-11 23:04:37.000000000 +0200
++++ net-snmp-5.5/configure.d/config_os_libs    2010-05-12 14:24:23.649259395 +0200
+@@ -310,18 +310,6 @@
+     NETSNMP_SEARCH_LIBS(BZ2_bzread, bz2,,, $LMIBLIBS, _rpmlibs)
+   fi
  
 -  # two variants of db1 need checking.
--  AC_CHECK_LIB(db1, dbopen, [_rpmlibs="-ldb1 $_rpmlibs"],
--     AC_CHECK_LIB(db, dbopen, [_rpmlibs="-ldb $_rpmlibs"]))
+-  NETSNMP_SEARCH_LIBS(dbopen, [db1 db],,, $LMIBLIBS, _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"]))
+-  NETSNMP_SEARCH_LIBS(db_create, [db-3.1 db-3.0],,, $LMIBLIBS, _rpmlibs)
 -  
 -  # rpm-3.0.5 and later needs popt.
--  AC_CHECK_LIB(popt, poptParseArgvString, [_rpmlibs="-lpopt $_rpmlibs"])
+-  NETSNMP_SEARCH_LIBS(poptParseArgvString, popt,,, $LMIBLIBS, _rpmlibs)
 -  
 -  # rpm-4.0.x needs rpmio.
--  AC_CHECK_LIB(rpmio, Fopen, [_rpmlibs="-lrpmio $_rpmlibs"],,$_rpmlibs)
+-  NETSNMP_SEARCH_LIBS(Fopen, 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)