From 5dabf01c339bd7a987de66af68fc9cf7e10cbfc4 Mon Sep 17 00:00:00 2001 From: "hyunghwan.chung" Date: Fri, 2 Feb 2018 14:53:00 +0000 Subject: [PATCH] added check for dl library --- moo/Makefile.in | 1 + moo/configure | 61 +++++++++++++++++++++++++++++++++++++++++++++ moo/configure.ac | 5 ++++ moo/lib/Makefile.in | 1 + moo/mod/Makefile.in | 1 + 5 files changed, 69 insertions(+) diff --git a/moo/Makefile.in b/moo/Makefile.in index bd72e81..4be54db 100644 --- a/moo/Makefile.in +++ b/moo/Makefile.in @@ -233,6 +233,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNCALL_LIBS = @DYNCALL_LIBS@ diff --git a/moo/configure b/moo/configure index b900941..88854ea 100755 --- a/moo/configure +++ b/moo/configure @@ -681,6 +681,7 @@ UNICOWS_LIBS SOCKET_LIBS TERMINAL_LIBS DYNCALL_LIBS +DL_LIBS PTHREAD_CFLAGS PTHREAD_LIBS PTHREAD_CC @@ -19690,6 +19691,66 @@ fi done +save_LIBS="$LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 +$as_echo_n "checking for library containing dlopen... " >&6; } +if ${ac_cv_search_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +for ac_lib in '' dl dld; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_dlopen=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_dlopen+:} false; then : + break +fi +done +if ${ac_cv_search_dlopen+:} false; then : + +else + ac_cv_search_dlopen=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +$as_echo "$ac_cv_search_dlopen" >&6; } +ac_res=$ac_cv_search_dlopen +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + DL_LIBS="$ac_cv_search_dlopen" +fi + +LIBS="$save_LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcNewCallVM in -ldyncall_s" >&5 $as_echo_n "checking for dcNewCallVM in -ldyncall_s... " >&6; } if ${ac_cv_lib_dyncall_s_dcNewCallVM+:} false; then : diff --git a/moo/configure.ac b/moo/configure.ac index c3787b5..5974adb 100644 --- a/moo/configure.ac +++ b/moo/configure.ac @@ -176,6 +176,11 @@ AC_CHECK_FUNCS([snprintf _vsnprintf _vsnwprintf strerror_r]) AC_CHECK_FUNCS([accept4]) AC_CHECK_FUNCS([isatty]) +save_LIBS="$LIBS" +AC_SEARCH_LIBS([dlopen], [dl dld], [DL_LIBS="$ac_cv_search_dlopen"]) +LIBS="$save_LIBS" +AC_SUBST(DL_LIBS) + AC_CHECK_LIB([dyncall_s], [dcNewCallVM], [ DYNCALL_LIBS="-ldyncall_s" diff --git a/moo/lib/Makefile.in b/moo/lib/Makefile.in index d94bdc5..21f61d1 100644 --- a/moo/lib/Makefile.in +++ b/moo/lib/Makefile.in @@ -274,6 +274,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNCALL_LIBS = @DYNCALL_LIBS@ diff --git a/moo/mod/Makefile.in b/moo/mod/Makefile.in index d12117b..d60b58f 100644 --- a/moo/mod/Makefile.in +++ b/moo/mod/Makefile.in @@ -300,6 +300,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ DYNCALL_LIBS = @DYNCALL_LIBS@