Skip to content

Commit c497eff

Browse files
authored
Merge pull request #27 from ycongal-smile/master
autoconf: change SONAME detection source from ldd to objdump
2 parents 9ef3f08 + d54a104 commit c497eff

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

m4/au_check_lib_soname.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ m4_pattern_allow([^AU_])
1111
AC_DEFUN([AU_CHECK_LIB_SONAME], [
1212
AC_REQUIRE([LT_INIT])
1313
AS_VAR_PUSHDEF([ac_Lib_SONAME], [au_cv_lib_soname_$1])
14-
AC_ARG_VAR([$1][_SONAME], [SONAME of lib$2, overriding ldd check])
14+
AC_ARG_VAR([$1][_SONAME], [SONAME of lib$2, overriding objdump check])
1515
AC_CHECK_LIB($2,$3,[
16-
AC_PATH_PROG([PATH_LDD], [ldd])
16+
AC_PATH_PROG([PATH_OBJDUMP], [objdump])
1717
AC_CACHE_CHECK([for SONAME of lib$2], [ac_Lib_SONAME],[
1818
AS_IF([test x"$[$1][_SONAME]" = x""], [
19-
AS_IF([test x"$PATH_LDD" != x""], [
19+
AS_IF([test x"$PATH_OBJDUMP" != x""], [
2020
AS_VAR_SET([ac_Lib_SONAME], ["unknown"])
2121
AU_CHECK_LIB_SONAME_LIBS="$LIBS"
2222
LIBS="$LIBS $7 -l$2"
@@ -26,7 +26,7 @@ void libusb_close(void *);
2626
], [
2727
libusb_close((void*)0);
2828
],
29-
[AS_VAR_SET([ac_Lib_SONAME], [`ldd conftest$ac_exeext | grep 'lib[$2]'$shrext_regexp | sed 's/^@<:@ \t@:>@*lib[$2]'$shrext_regexp'/lib[$2]'$shrext_regexp'/;s/@<:@ \t@:>@.*$//'`])])
29+
[AS_VAR_SET([ac_Lib_SONAME], [`objdump -p conftest$ac_exeext | sed -n 's/@<:@ \t@:>@\+NEEDED@<:@ \t@:>@\+\('lib[$2]$shrext_regexp'.*\)$/\1/p'`])])
3030
LIBS="$AU_CHECK_LIB_SONAME_LIBS"
3131
AS_IF([test x"$ac_Lib_SONAME" = x ],
3232
[AS_VAR_SET([ac_Lib_SONAME], [unknown])])

0 commit comments

Comments
 (0)