diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-14 17:05:47 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-14 17:05:47 +0000 |
commit | 20462c329400ee3c46be25a0adb338ee90ef6fac (patch) | |
tree | 397276f655f85e6ba38660a514d5e3b38f179240 /configure | |
parent | a067f275f9645079a398f69ade1260ce7b0ab5d4 (diff) |
Merged revisions 108740 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r108740 | russell | 2008-03-14 12:05:11 -0500 (Fri, 14 Mar 2008) | 5 lines
Do a link test in AST_EXT_TOOL_CHECK() to ensure we have all the required libs
reported by the tool.
(closes issue #12067, reported by Juggie, patched by me)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@108741 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 50 |
1 files changed, 34 insertions, 16 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 107409 . +# From configure.ac Revision: 107463 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -35440,6 +35440,9 @@ fi fi CPPFLAGS="${CPPFLAGS} ${NETSNMP_INCLUDE}" + saved_ldflags="${LDFLAGS}" + LDFLAGS="${NETSNMP_LIB}" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -35458,14 +35461,14 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" 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 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -35474,7 +35477,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then PBX_NETSNMP=1 cat >>confdefs.h <<\_ACEOF @@ -35490,8 +35494,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" + LDFLAGS="${saved_ldflags}" else PBX_NETSNMP=1 @@ -47734,6 +47740,9 @@ fi fi CPPFLAGS="${CPPFLAGS} ${SDL_INCLUDE}" + saved_ldflags="${LDFLAGS}" + LDFLAGS="${SDL_LIB}" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -47750,14 +47759,14 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" 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 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -47766,7 +47775,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then PBX_SDL=1 cat >>confdefs.h <<\_ACEOF @@ -47782,8 +47792,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" + LDFLAGS="${saved_ldflags}" else PBX_SDL=1 @@ -49124,6 +49136,9 @@ fi fi CPPFLAGS="${CPPFLAGS} ${GTK_INCLUDE}" + saved_ldflags="${LDFLAGS}" + LDFLAGS="${GTK_LIB}" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -49140,14 +49155,14 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" 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 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -49156,7 +49171,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then PBX_GTK=1 cat >>confdefs.h <<\_ACEOF @@ -49172,8 +49188,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext CPPFLAGS="${saved_cppflags}" + LDFLAGS="${saved_ldflags}" else PBX_GTK=1 |