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/trunk@108740 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
0cec66d8ed
commit
31e371c804
2 changed files with 39 additions and 17 deletions
|
@ -230,7 +230,10 @@ AC_DEFUN([AST_EXT_TOOL_CHECK],
|
||||||
fi
|
fi
|
||||||
CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
|
CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
|
||||||
|
|
||||||
AC_COMPILE_IFELSE(
|
saved_ldflags="${LDFLAGS}"
|
||||||
|
LDFLAGS="${$1_LIB}"
|
||||||
|
|
||||||
|
AC_LINK_IFELSE(
|
||||||
[ AC_LANG_PROGRAM( [ $5 ],
|
[ AC_LANG_PROGRAM( [ $5 ],
|
||||||
[ $6; ]
|
[ $6; ]
|
||||||
)],
|
)],
|
||||||
|
@ -240,6 +243,7 @@ AC_DEFUN([AST_EXT_TOOL_CHECK],
|
||||||
[]
|
[]
|
||||||
)
|
)
|
||||||
CPPFLAGS="${saved_cppflags}"
|
CPPFLAGS="${saved_cppflags}"
|
||||||
|
LDFLAGS="${saved_ldflags}"
|
||||||
else
|
else
|
||||||
PBX_$1=1
|
PBX_$1=1
|
||||||
AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])
|
AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])
|
||||||
|
|
50
configure
vendored
50
configure
vendored
|
@ -1,5 +1,5 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# From configure.ac Revision: 107409 .
|
# From configure.ac Revision: 107462 .
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
|
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
|
||||||
#
|
#
|
||||||
|
@ -35440,6 +35440,9 @@ fi
|
||||||
fi
|
fi
|
||||||
CPPFLAGS="${CPPFLAGS} ${NETSNMP_INCLUDE}"
|
CPPFLAGS="${CPPFLAGS} ${NETSNMP_INCLUDE}"
|
||||||
|
|
||||||
|
saved_ldflags="${LDFLAGS}"
|
||||||
|
LDFLAGS="${NETSNMP_LIB}"
|
||||||
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
/* confdefs.h. */
|
/* confdefs.h. */
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
@ -35458,14 +35461,14 @@ main ()
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
_ACEOF
|
_ACEOF
|
||||||
rm -f conftest.$ac_objext
|
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||||
if { (ac_try="$ac_compile"
|
if { (ac_try="$ac_link"
|
||||||
case "(($ac_try" in
|
case "(($ac_try" in
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
*) ac_try_echo=$ac_try;;
|
*) ac_try_echo=$ac_try;;
|
||||||
esac
|
esac
|
||||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||||
(eval "$ac_compile") 2>conftest.er1
|
(eval "$ac_link") 2>conftest.er1
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
grep -v '^ *+' conftest.er1 >conftest.err
|
grep -v '^ *+' conftest.er1 >conftest.err
|
||||||
rm -f conftest.er1
|
rm -f conftest.er1
|
||||||
|
@ -35474,7 +35477,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||||
(exit $ac_status); } && {
|
(exit $ac_status); } && {
|
||||||
test -z "$ac_c_werror_flag" ||
|
test -z "$ac_c_werror_flag" ||
|
||||||
test ! -s conftest.err
|
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
|
PBX_NETSNMP=1
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
|
@ -35490,8 +35494,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
fi
|
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}"
|
CPPFLAGS="${saved_cppflags}"
|
||||||
|
LDFLAGS="${saved_ldflags}"
|
||||||
else
|
else
|
||||||
PBX_NETSNMP=1
|
PBX_NETSNMP=1
|
||||||
|
|
||||||
|
@ -47734,6 +47740,9 @@ fi
|
||||||
fi
|
fi
|
||||||
CPPFLAGS="${CPPFLAGS} ${SDL_INCLUDE}"
|
CPPFLAGS="${CPPFLAGS} ${SDL_INCLUDE}"
|
||||||
|
|
||||||
|
saved_ldflags="${LDFLAGS}"
|
||||||
|
LDFLAGS="${SDL_LIB}"
|
||||||
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
/* confdefs.h. */
|
/* confdefs.h. */
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
@ -47750,14 +47759,14 @@ main ()
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
_ACEOF
|
_ACEOF
|
||||||
rm -f conftest.$ac_objext
|
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||||
if { (ac_try="$ac_compile"
|
if { (ac_try="$ac_link"
|
||||||
case "(($ac_try" in
|
case "(($ac_try" in
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
*) ac_try_echo=$ac_try;;
|
*) ac_try_echo=$ac_try;;
|
||||||
esac
|
esac
|
||||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||||
(eval "$ac_compile") 2>conftest.er1
|
(eval "$ac_link") 2>conftest.er1
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
grep -v '^ *+' conftest.er1 >conftest.err
|
grep -v '^ *+' conftest.er1 >conftest.err
|
||||||
rm -f conftest.er1
|
rm -f conftest.er1
|
||||||
|
@ -47766,7 +47775,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||||
(exit $ac_status); } && {
|
(exit $ac_status); } && {
|
||||||
test -z "$ac_c_werror_flag" ||
|
test -z "$ac_c_werror_flag" ||
|
||||||
test ! -s conftest.err
|
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
|
PBX_SDL=1
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
|
@ -47782,8 +47792,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
fi
|
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}"
|
CPPFLAGS="${saved_cppflags}"
|
||||||
|
LDFLAGS="${saved_ldflags}"
|
||||||
else
|
else
|
||||||
PBX_SDL=1
|
PBX_SDL=1
|
||||||
|
|
||||||
|
@ -49124,6 +49136,9 @@ fi
|
||||||
fi
|
fi
|
||||||
CPPFLAGS="${CPPFLAGS} ${GTK_INCLUDE}"
|
CPPFLAGS="${CPPFLAGS} ${GTK_INCLUDE}"
|
||||||
|
|
||||||
|
saved_ldflags="${LDFLAGS}"
|
||||||
|
LDFLAGS="${GTK_LIB}"
|
||||||
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
/* confdefs.h. */
|
/* confdefs.h. */
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
@ -49140,14 +49155,14 @@ main ()
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
_ACEOF
|
_ACEOF
|
||||||
rm -f conftest.$ac_objext
|
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||||
if { (ac_try="$ac_compile"
|
if { (ac_try="$ac_link"
|
||||||
case "(($ac_try" in
|
case "(($ac_try" in
|
||||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||||
*) ac_try_echo=$ac_try;;
|
*) ac_try_echo=$ac_try;;
|
||||||
esac
|
esac
|
||||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||||
(eval "$ac_compile") 2>conftest.er1
|
(eval "$ac_link") 2>conftest.er1
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
grep -v '^ *+' conftest.er1 >conftest.err
|
grep -v '^ *+' conftest.er1 >conftest.err
|
||||||
rm -f conftest.er1
|
rm -f conftest.er1
|
||||||
|
@ -49156,7 +49171,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||||
(exit $ac_status); } && {
|
(exit $ac_status); } && {
|
||||||
test -z "$ac_c_werror_flag" ||
|
test -z "$ac_c_werror_flag" ||
|
||||||
test ! -s conftest.err
|
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
|
PBX_GTK=1
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
cat >>confdefs.h <<\_ACEOF
|
||||||
|
@ -49172,8 +49188,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
fi
|
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}"
|
CPPFLAGS="${saved_cppflags}"
|
||||||
|
LDFLAGS="${saved_ldflags}"
|
||||||
else
|
else
|
||||||
PBX_GTK=1
|
PBX_GTK=1
|
||||||
|
|
||||||
|
|
Reference in a new issue