Permalink
Browse files

Fix ltdl.h auto-detection

The lt_dlcaller_register() function is no longer in ltdl so use
lt_dlinterface_register() instead. This fixes the following configure problem
even when libltdl is installed:

  checking for library containing lt_dlcaller_register... no
  configure: error: Can't find the libltdl library.

Signed-off-by: Pekka Enberg <penberg@kernel.org>
  • Loading branch information...
1 parent f477b9a commit 17d3540497ec172aab433fb2bc25beaf00e07278 @penberg penberg committed Jun 20, 2011
Showing with 13 additions and 13 deletions.
  1. +12 −12 configure
  2. +1 −1 configure.ac
View
@@ -16865,9 +16865,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
if test "x$ac_cv_header_ltdl_h" = x""yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing lt_dlcaller_register" >&5
-$as_echo_n "checking for library containing lt_dlcaller_register... " >&6; }
-if test "${ac_cv_search_lt_dlcaller_register+set}" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing lt_dlinterface_register" >&5
+$as_echo_n "checking for library containing lt_dlinterface_register... " >&6; }
+if test "${ac_cv_search_lt_dlinterface_register+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -16880,11 +16880,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char lt_dlcaller_register ();
+char lt_dlinterface_register ();
int
main ()
{
-return lt_dlcaller_register ();
+return lt_dlinterface_register ();
;
return 0;
}
@@ -16897,25 +16897,25 @@ for ac_lib in '' ltdl; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_lt_dlcaller_register=$ac_res
+ ac_cv_search_lt_dlinterface_register=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if test "${ac_cv_search_lt_dlcaller_register+set}" = set; then :
+ if test "${ac_cv_search_lt_dlinterface_register+set}" = set; then :
break
fi
done
-if test "${ac_cv_search_lt_dlcaller_register+set}" = set; then :
+if test "${ac_cv_search_lt_dlinterface_register+set}" = set; then :
else
- ac_cv_search_lt_dlcaller_register=no
+ ac_cv_search_lt_dlinterface_register=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_lt_dlcaller_register" >&5
-$as_echo "$ac_cv_search_lt_dlcaller_register" >&6; }
-ac_res=$ac_cv_search_lt_dlcaller_register
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_lt_dlinterface_register" >&5
+$as_echo "$ac_cv_search_lt_dlinterface_register" >&6; }
+ac_res=$ac_cv_search_lt_dlinterface_register
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
View
@@ -302,7 +302,7 @@ AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AC_CHECK_HEADER([ltdl.h],
- [AC_SEARCH_LIBS([lt_dlcaller_register], [ltdl], [], [AC_MSG_ERROR([Can't find the libltdl library.])])],
+ [AC_SEARCH_LIBS([lt_dlinterface_register], [ltdl], [], [AC_MSG_ERROR([Can't find the libltdl library.])])],
[AC_MSG_ERROR([Can't find the ltdl.h header file from the libltdl library])])
## Let users override the linker used by libtool, but default to $CC.

0 comments on commit 17d3540

Please sign in to comment.