- 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 d575a660997a88cd0d27a65f417de4364468eae6..0aa61c0edd1efdbe1d9c664993b533aee9d5969a 100644 (file)
--- a/net-snmp-rpm-implicit-libs.patch
+++ b/net-snmp-rpm-implicit-libs.patch
@@ -1,27 +1,12 @@
---- net-snmp-5.1/configure.in.wiget    Wed Feb 12 16:04:32 2003
-+++ net-snmp-5.1/configure.in  Wed Feb 12 16:08:36 2003
-@@ -1403,24 +1403,6 @@
-       AC_CHECK_LIB(z, gzread, , CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
-       CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
+--- 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 bzip2 need checking.
--  AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"],
--     AC_CHECK_LIB(bz2, BZ2_bzread, [_rpmlibs="$_rpmlibs -lbz2"],))
--
--  # 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)