diff options
| -rwxr-xr-x | configure | 83 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 6 | ||||
| -rw-r--r-- | main/loader.c | 13 |
4 files changed, 2 insertions, 102 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 181450 . +# From configure.ac Revision: 182945 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -961,7 +961,6 @@ GC_LDFLAGS AST_DECLARATION_AFTER_STATEMENT AST_FORTIFY_SOURCE AST_NO_STRICT_OVERFLOW -PBX_RTLD_NOLOAD PBX_IP_MTU_DISCOVER GSM_INTERNAL PBX_MISDN_FAC_RESULT @@ -17750,83 +17749,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - if test "x${PBX_RTLD_NOLOAD}" != "x1"; then - { echo "$as_me:$LINENO: checking for RTLD_NOLOAD in dlfcn.h" >&5 -echo $ECHO_N "checking for RTLD_NOLOAD in dlfcn.h... $ECHO_C" >&6; } - saved_cppflags="${CPPFLAGS}" - if test "x${RTLD_NOLOAD_DIR}" != "x"; then - RTLD_NOLOAD_INCLUDE="-I${RTLD_NOLOAD_DIR}/include" - fi - CPPFLAGS="${CPPFLAGS} ${RTLD_NOLOAD_INCLUDE}" - - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <dlfcn.h> -int -main () -{ -#if defined(RTLD_NOLOAD) - int foo = 0; - #else - int foo = bar; - #endif - 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - PBX_RTLD_NOLOAD=1 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_RTLD_NOLOAD 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_RTLD_NOLOAD_VERSION -_ACEOF - - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="${saved_cppflags}" - fi - - - - if test "x${PBX_IP_MTU_DISCOVER}" != "x1"; then { echo "$as_me:$LINENO: checking for IP_MTU_DISCOVER in netinet/in.h" >&5 echo $ECHO_N "checking for IP_MTU_DISCOVER in netinet/in.h... $ECHO_C" >&6; } @@ -50511,7 +50433,6 @@ GC_LDFLAGS!$GC_LDFLAGS$ac_delim AST_DECLARATION_AFTER_STATEMENT!$AST_DECLARATION_AFTER_STATEMENT$ac_delim AST_FORTIFY_SOURCE!$AST_FORTIFY_SOURCE$ac_delim AST_NO_STRICT_OVERFLOW!$AST_NO_STRICT_OVERFLOW$ac_delim -PBX_RTLD_NOLOAD!$PBX_RTLD_NOLOAD$ac_delim PBX_IP_MTU_DISCOVER!$PBX_IP_MTU_DISCOVER$ac_delim GSM_INTERNAL!$GSM_INTERNAL$ac_delim PBX_MISDN_FAC_RESULT!$PBX_MISDN_FAC_RESULT$ac_delim @@ -50539,7 +50460,7 @@ CURL_CONFIG!$CURL_CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index b4f9ad07c..577c8f992 100644 --- a/configure.ac +++ b/configure.ac @@ -569,8 +569,6 @@ AC_LINK_IFELSE( AC_MSG_RESULT(no) ) -AST_C_DEFINE_CHECK([RTLD_NOLOAD], [RTLD_NOLOAD], [dlfcn.h]) - AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [IP_MTU_DISCOVER], [netinet/in.h]) AC_CHECK_HEADER([libkern/OSAtomic.h], diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index ae00a91e9..2ac174551 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -694,12 +694,6 @@ /* Define to indicate the ${ROUND_DESCRIP} library version */ #undef HAVE_ROUND_VERSION -/* Define if your system has the RTLD_NOLOAD headers. */ -#undef HAVE_RTLD_NOLOAD - -/* Define RTLD_NOLOAD headers version */ -#undef HAVE_RTLD_NOLOAD_VERSION - /* Define to 1 if your system has /sbin/launchd. */ #undef HAVE_SBIN_LAUNCHD diff --git a/main/loader.c b/main/loader.c index 616dc76aa..274078960 100644 --- a/main/loader.c +++ b/main/loader.c @@ -398,18 +398,6 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned return NULL; } - /* if the system supports RTLD_NOLOAD, we can just 'promote' the flags - on the already-opened library to what we want... if not, we have to - close it and start over - */ -#if defined(HAVE_RTLD_NOLOAD) && !defined(__Darwin__) - if (!dlopen(fn, RTLD_NOLOAD | (wants_global ? RTLD_LAZY | RTLD_GLOBAL : RTLD_NOW | RTLD_LOCAL))) { - ast_log(LOG_WARNING, "Unable to promote flags on module '%s': %s\n", resource_in, dlerror()); - while (!dlclose(lib)); - ast_free(resource_being_loaded); - return NULL; - } -#else while (!dlclose(lib)); resource_being_loaded = NULL; @@ -430,7 +418,6 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned /* since the module was successfully opened, and it registered itself the previous time we did that, we're going to assume it worked this time too :) */ -#endif AST_LIST_LAST(&module_list)->lib = lib; resource_being_loaded = NULL; |