From: Frank Ch. Eigler <fche@redhat.com>
Date: Fri, 5 Jun 2020 16:16:19 +0000 (-0400)
Subject: configury: adjust -lebl check to ebl_strtabinit
X-Git-Tag: release-4.3~20
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=a1bbefd797d59a411fef6f77e9ad8527424dbccd;p=systemtap.git

configury: adjust -lebl check to ebl_strtabinit

While -lebl has been integrated into -ldw in recent versions of
elfutils, some older versions need a better aimed check, for
the exact symbol that bpf-translate.cxx uses.
---

diff --git a/configure b/configure
index d210828dc..37a2b06b9 100755
--- a/configure
+++ b/configure
@@ -11533,9 +11533,9 @@ if test $enable_translator = yes; then
     # merged into libdw
     # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=457543
     save_LIBS="$LIBS"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ebl_get_elfmachine in -lebl" >&5
-$as_echo_n "checking for ebl_get_elfmachine in -lebl... " >&6; }
-if ${ac_cv_lib_ebl_ebl_get_elfmachine+:} false; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ebl_strtabinit in -lebl" >&5
+$as_echo_n "checking for ebl_strtabinit in -lebl... " >&6; }
+if ${ac_cv_lib_ebl_ebl_strtabinit+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11549,27 +11549,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ebl_get_elfmachine ();
+char ebl_strtabinit ();
 int
 main ()
 {
-return ebl_get_elfmachine ();
+return ebl_strtabinit ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ebl_ebl_get_elfmachine=yes
+  ac_cv_lib_ebl_ebl_strtabinit=yes
 else
-  ac_cv_lib_ebl_ebl_get_elfmachine=no
+  ac_cv_lib_ebl_ebl_strtabinit=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ebl_ebl_get_elfmachine" >&5
-$as_echo "$ac_cv_lib_ebl_ebl_get_elfmachine" >&6; }
-if test "x$ac_cv_lib_ebl_ebl_get_elfmachine" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ebl_ebl_strtabinit" >&5
+$as_echo "$ac_cv_lib_ebl_ebl_strtabinit" >&6; }
+if test "x$ac_cv_lib_ebl_ebl_strtabinit" = xyes; then :
   ebl_LIBS=-lebl
 else
   ebl_LIBS=
diff --git a/configure.ac b/configure.ac
index 7e3c5b3e1..34847ada1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -597,7 +597,7 @@ if test $enable_translator = yes; then
     # merged into libdw
     # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=457543
     save_LIBS="$LIBS"
-    AC_CHECK_LIB(ebl, ebl_get_elfmachine,[ebl_LIBS=-lebl],[ebl_LIBS=])
+    AC_CHECK_LIB(ebl, ebl_strtabinit,[ebl_LIBS=-lebl],[ebl_LIBS=])
     LIBS="$save_LIBS"
 
     save_LIBS="$LIBS"