build: re-enable librpm checking

* configure.ac: With AC_CHECK_LIB()'s four-parameter variant,
  the default AC_DEFINE etc. is removed, so restore the key
  parts by hand.

3 files changed, 19 insertions, 6 deletions

diff --git a/config.in b/config.in
index dc43d94d..afb63453 100644
--- a/config.in
+++ b/config.in
@@ -30,6 +30,9 @@
 /* Define to 1 if you have the `pfm' library (-lpfm). */
 #undef HAVE_LIBPFM
 
+/* have librpm */
+#undef HAVE_LIBRPM
+
 /* Define to 1 if you have the `sqlite3' library (-lsqlite3). */
 #undef HAVE_LIBSQLITE3
 
diff --git a/configure b/configure
index e0e41f9a..786e43bd 100755
--- a/configure
+++ b/configure
@@ -8231,7 +8231,14 @@ fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rpm_rpmtsInitIterator" >&5
 $as_echo "$ac_cv_lib_rpm_rpmtsInitIterator" >&6; }
 if test "x$ac_cv_lib_rpm_rpmtsInitIterator" = x""yes; then
-  have_librpm="yes"
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBRPM 1
+_ACEOF
+
+                    stap_LIBS="$stap_LIBS -lrpm"
+                    have_librpm="yes"
 else
   have_librpm="no"
 fi
@@ -8436,11 +8443,11 @@ $as_echo "$as_me: error: elfutils, libdw too old, need 0.126+" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-    stap_LIBS="-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf"
+    stap_LIBS="$stap_LIBS -Wl,--start-group -ldw -lebl -Wl,--end-group -lelf"
     LIBS="$save_LIBS"
   else
     # We built our own and stap_LDFLAGS points at the install.
-    stap_LIBS="-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf"
+    stap_LIBS="$stap_LIBS -Wl,--start-group -ldw -lebl -Wl,--end-group -lelf"
   fi
 fi
 
diff --git a/configure.ac b/configure.ac
index b37429d8..46719599 100644
--- a/configure.ac
+++ b/configure.ac
@@ -377,7 +377,10 @@ AC_ARG_WITH([rpm],
   [AS_HELP_STRING([--with-rpm],
                   [query rpm database for missing debuginfos])], [], [with_rpm="auto"])
 if test "$with_rpm" != "no"; then
-  AC_CHECK_LIB(rpm, rpmtsInitIterator, have_librpm="yes", have_librpm="no")
+  AC_CHECK_LIB(rpm, rpmtsInitIterator, [
+                    AC_DEFINE([HAVE_LIBRPM],[1],[have librpm])
+                    stap_LIBS="$stap_LIBS -lrpm"
+                    have_librpm="yes"], [have_librpm="no"])
   if test "x$have_librpm" != "xyes" -a "$with_rpm" == "yes"; then
      AC_MSG_ERROR([cannot find librpm])
   fi
@@ -410,11 +413,11 @@ if test $enable_translator = yes; then
     AC_CHECK_LIB(dw, dwarf_getelf,[],[
       AC_MSG_ERROR([elfutils, libdw too old, need 0.126+])],
       [-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf])
-    stap_LIBS="-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf"
+    stap_LIBS="$stap_LIBS -Wl,--start-group -ldw -lebl -Wl,--end-group -lelf"
     LIBS="$save_LIBS"
   else
     # We built our own and stap_LDFLAGS points at the install.
-    stap_LIBS="-Wl,--start-group -ldw -lebl -Wl,--end-group -lelf"
+    stap_LIBS="$stap_LIBS -Wl,--start-group -ldw -lebl -Wl,--end-group -lelf"
   fi
 fi