Skip to content
Snippets Groups Projects
Commit 36f94cbc authored by Jenkins2's avatar Jenkins2 Committed by Gerrit Code Review
Browse files

Merge "Build System: Fixes for configure script." into 13

parents dcac292a 01b3c435
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
configure
+ 32
− 237
View file @ 36f94cbc
...@@ -7774,7 +7774,7 @@ if test "${WGET}" != ":" ; then ...@@ -7774,7 +7774,7 @@ if test "${WGET}" != ":" ; then
DOWNLOAD=${WGET} DOWNLOAD=${WGET}
DOWNLOAD_TO_STDOUT="${WGET} -q -O-" DOWNLOAD_TO_STDOUT="${WGET} -q -O-"
DOWNLOAD_TIMEOUT='--timeout=$1' DOWNLOAD_TIMEOUT='--timeout=$1'
else if test "${CURL}" != ":" ; then elif test "${CURL}" != ":" ; then
DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\"" DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""
DOWNLOAD_TO_STDOUT="${CURL} -Ls" DOWNLOAD_TO_STDOUT="${CURL} -Ls"
DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)' DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
...@@ -7826,7 +7826,6 @@ fi ...@@ -7826,7 +7826,6 @@ fi
DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)' DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'
fi fi
fi fi
fi
   
   
   
...@@ -19444,15 +19443,15 @@ if test $ac_cv_sizeof_int = $ac_cv_sizeof_fd_set_fds_bits; then ...@@ -19444,15 +19443,15 @@ if test $ac_cv_sizeof_int = $ac_cv_sizeof_fd_set_fds_bits; then
   
$as_echo "#define TYPEOF_FD_SET_FDS_BITS int" >>confdefs.h $as_echo "#define TYPEOF_FD_SET_FDS_BITS int" >>confdefs.h
   
else if test $ac_cv_sizeof_long = $ac_cv_sizeof_fd_set_fds_bits; then elif test $ac_cv_sizeof_long = $ac_cv_sizeof_fd_set_fds_bits; then
   
$as_echo "#define TYPEOF_FD_SET_FDS_BITS long" >>confdefs.h $as_echo "#define TYPEOF_FD_SET_FDS_BITS long" >>confdefs.h
   
else if test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then elif test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then
   
$as_echo "#define TYPEOF_FD_SET_FDS_BITS long long" >>confdefs.h $as_echo "#define TYPEOF_FD_SET_FDS_BITS long long" >>confdefs.h
   
fi ; fi ; fi fi
   
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladdr in dlfcn.h" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladdr in dlfcn.h" >&5
$as_echo_n "checking for dladdr in dlfcn.h... " >&6; } $as_echo_n "checking for dladdr in dlfcn.h... " >&6; }
...@@ -20614,15 +20613,13 @@ cat >>confdefs.h <<_ACEOF ...@@ -20614,15 +20613,13 @@ cat >>confdefs.h <<_ACEOF
_ACEOF _ACEOF
   
GSM_OK=1 GSM_OK=1
else elif test "${GSM_GSM_HEADER_FOUND}" = "1" ; then
if test "${GSM_GSM_HEADER_FOUND}" = "1" ; then
   
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_GSM_GSM_HEADER 1 #define HAVE_GSM_GSM_HEADER 1
_ACEOF _ACEOF
   
GSM_OK=1 GSM_OK=1
fi
fi fi
if test "${GSM_OK}" = "1" ; then if test "${GSM_OK}" = "1" ; then
GSM_LIB="-lgsm" GSM_LIB="-lgsm"
...@@ -28702,6 +28699,7 @@ fi ...@@ -28702,6 +28699,7 @@ fi
   
   
   
for ver in 5.3 5.2 5.1; do
   
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir="" pbxlibdir=""
...@@ -28716,117 +28714,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then ...@@ -28716,117 +28714,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
   
ast_ext_lib_check_save_CFLAGS="${CFLAGS}" ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} " CFLAGS="${CFLAGS} "
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.3" >&5 as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh`
$as_echo_n "checking for luaL_newstate in -llua5.3... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5
if ${ac_cv_lib_lua5_3_luaL_newstate+:} false; then : $as_echo_n "checking for luaL_newstate in -llua${ver}... " >&6; }
$as_echo_n "(cached) " >&6 if eval \${$as_ac_Lib+:} false; then :
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-llua5.3 ${pbxlibdir} -lm $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 luaL_newstate ();
int
main ()
{
return luaL_newstate ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_lua5_3_luaL_newstate=yes
else
ac_cv_lib_lua5_3_luaL_newstate=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_3_luaL_newstate" >&5
$as_echo "$ac_cv_lib_lua5_3_luaL_newstate" >&6; }
if test "x$ac_cv_lib_lua5_3_luaL_newstate" = xyes; then :
AST_LUA_FOUND=yes
else
AST_LUA_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
LUA_LIB="${pbxlibdir} -llua5.3 -lm"
# if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then
LUA_INCLUDE="-I${LUA_DIR}/include"
fi
LUA_INCLUDE="${LUA_INCLUDE} "
# check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "lua5.3/lua.h" "ac_cv_header_lua5_3_lua_h" "$ac_includes_default"
if test "x$ac_cv_header_lua5_3_lua_h" = xyes; then :
LUA_HEADER_FOUND=1
else
LUA_HEADER_FOUND=0
fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
if test "x${LUA_HEADER_FOUND}" = "x0" ; then
LUA_LIB=""
LUA_INCLUDE=""
else
PBX_LUA=1
cat >>confdefs.h <<_ACEOF
#define HAVE_LUA 1
_ACEOF
fi
fi
fi
if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then
LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.3"
else
LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.3"
fi
fi
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir=""
# if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then
if test -d ${LUA_DIR}/lib; then
pbxlibdir="-L${LUA_DIR}/lib"
else
pbxlibdir="-L${LUA_DIR}"
fi
fi
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2" >&5
$as_echo_n "checking for luaL_newstate in -llua5.2... " >&6; }
if ${ac_cv_lib_lua5_2_luaL_newstate+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-llua5.2 ${pbxlibdir} -lm $LIBS" LIBS="-llua${ver} ${pbxlibdir} -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
   
...@@ -28846,121 +28741,18 @@ return luaL_newstate (); ...@@ -28846,121 +28741,18 @@ return luaL_newstate ();
} }
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_lua5_2_luaL_newstate=yes eval "$as_ac_Lib=yes"
else else
ac_cv_lib_lua5_2_luaL_newstate=no eval "$as_ac_Lib=no"
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_2_luaL_newstate" >&5 eval ac_res=\$$as_ac_Lib
$as_echo "$ac_cv_lib_lua5_2_luaL_newstate" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
if test "x$ac_cv_lib_lua5_2_luaL_newstate" = xyes; then : $as_echo "$ac_res" >&6; }
AST_LUA_FOUND=yes if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
else
AST_LUA_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
LUA_LIB="${pbxlibdir} -llua5.2 -lm"
# if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then
LUA_INCLUDE="-I${LUA_DIR}/include"
fi
LUA_INCLUDE="${LUA_INCLUDE} "
# check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "lua5.2/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default"
if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then :
LUA_HEADER_FOUND=1
else
LUA_HEADER_FOUND=0
fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
if test "x${LUA_HEADER_FOUND}" = "x0" ; then
LUA_LIB=""
LUA_INCLUDE=""
else
PBX_LUA=1
cat >>confdefs.h <<_ACEOF
#define HAVE_LUA 1
_ACEOF
fi
fi
fi
if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then
LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.2"
else
LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.2"
fi
fi
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir=""
# if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then
if test -d ${LUA_DIR}/lib; then
pbxlibdir="-L${LUA_DIR}/lib"
else
pbxlibdir="-L${LUA_DIR}"
fi
fi
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1" >&5
$as_echo_n "checking for luaL_newstate in -llua5.1... " >&6; }
if ${ac_cv_lib_lua5_1_luaL_newstate+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-llua5.1 ${pbxlibdir} -lm $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 luaL_newstate ();
int
main ()
{
return luaL_newstate ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_lua5_1_luaL_newstate=yes
else
ac_cv_lib_lua5_1_luaL_newstate=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_1_luaL_newstate" >&5
$as_echo "$ac_cv_lib_lua5_1_luaL_newstate" >&6; }
if test "x$ac_cv_lib_lua5_1_luaL_newstate" = xyes; then :
AST_LUA_FOUND=yes AST_LUA_FOUND=yes
else else
AST_LUA_FOUND=no AST_LUA_FOUND=no
...@@ -28971,7 +28763,7 @@ fi ...@@ -28971,7 +28763,7 @@ fi
   
# now check for the header. # now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then if test "${AST_LUA_FOUND}" = "yes"; then
LUA_LIB="${pbxlibdir} -llua5.1 -lm" LUA_LIB="${pbxlibdir} -llua${ver} -lm"
# if --with-LUA=DIR has been specified, use it. # if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then if test "x${LUA_DIR}" != "x"; then
LUA_INCLUDE="-I${LUA_DIR}/include" LUA_INCLUDE="-I${LUA_DIR}/include"
...@@ -28981,8 +28773,9 @@ fi ...@@ -28981,8 +28773,9 @@ fi
# check for the header # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default" as_ac_Header=`$as_echo "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh`
if test "x$ac_cv_header_lua5_1_lua_h" = xyes; then : ac_fn_c_check_header_mongrel "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
LUA_HEADER_FOUND=1 LUA_HEADER_FOUND=1
else else
LUA_HEADER_FOUND=0 LUA_HEADER_FOUND=0
...@@ -29006,13 +28799,15 @@ _ACEOF ...@@ -29006,13 +28799,15 @@ _ACEOF
fi fi
   
   
if test "x${PBX_LUA}" = "x1" ; then if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then if test x"${LUA_DIR}" = x; then
LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1" LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${ver}"
else else
LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1" LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${ver}"
fi
break;
fi fi
fi done
   
# Some distributions (like openSUSE and NetBSD) remove the 5.x suffix. # Some distributions (like openSUSE and NetBSD) remove the 5.x suffix.
   
...@@ -34938,9 +34733,9 @@ fi ...@@ -34938,9 +34733,9 @@ fi
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2 ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
if test "x${ac_cv_path_CMP}" = "x:"; then if test "x${ac_cv_path_CMP}" = "x:"; then
( cd `pwd`/menuselect && ./configure ) ( cd `pwd`/menuselect && ./configure )
else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else elif ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
( cd `pwd`/menuselect && ./configure ) ( cd `pwd`/menuselect && ./configure )
fi ; fi fi
   
rm makeopts.acbak makeopts.acbak2 rm makeopts.acbak makeopts.acbak2
   
......
configure.ac
+ 19
− 37
View file @ 36f94cbc
...@@ -294,7 +294,7 @@ if test "${WGET}" != ":" ; then ...@@ -294,7 +294,7 @@ if test "${WGET}" != ":" ; then
DOWNLOAD=${WGET} DOWNLOAD=${WGET}
DOWNLOAD_TO_STDOUT="${WGET} -q -O-" DOWNLOAD_TO_STDOUT="${WGET} -q -O-"
DOWNLOAD_TIMEOUT='--timeout=$1' DOWNLOAD_TIMEOUT='--timeout=$1'
else if test "${CURL}" != ":" ; then elif test "${CURL}" != ":" ; then
DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\"" DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""
DOWNLOAD_TO_STDOUT="${CURL} -Ls" DOWNLOAD_TO_STDOUT="${CURL} -Ls"
DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)' DOWNLOAD_TIMEOUT='--max-time $(or $2,$1)'
...@@ -306,7 +306,6 @@ else ...@@ -306,7 +306,6 @@ else
DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)' DOWNLOAD_TIMEOUT='--timeout=$(or $2,$1)'
fi fi
fi fi
fi
AC_SUBST(DOWNLOAD) AC_SUBST(DOWNLOAD)
AC_SUBST(DOWNLOAD_TO_STDOUT) AC_SUBST(DOWNLOAD_TO_STDOUT)
AC_SUBST(DOWNLOAD_TIMEOUT) AC_SUBST(DOWNLOAD_TIMEOUT)
...@@ -1430,11 +1429,11 @@ AC_CHECK_SIZEOF(fd_set.fds_bits) ...@@ -1430,11 +1429,11 @@ AC_CHECK_SIZEOF(fd_set.fds_bits)
# correctly if the size is wrong. # correctly if the size is wrong.
if test $ac_cv_sizeof_int = $ac_cv_sizeof_fd_set_fds_bits; then if test $ac_cv_sizeof_int = $ac_cv_sizeof_fd_set_fds_bits; then
AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [int], [Define to a type of the same size as fd_set.fds_bits[[0]]]) AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [int], [Define to a type of the same size as fd_set.fds_bits[[0]]])
else if test $ac_cv_sizeof_long = $ac_cv_sizeof_fd_set_fds_bits; then elif test $ac_cv_sizeof_long = $ac_cv_sizeof_fd_set_fds_bits; then
AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [long], [Define to a type of the same size as fd_set.fds_bits[[0]]]) AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [long], [Define to a type of the same size as fd_set.fds_bits[[0]]])
else if test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then elif test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then
AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [long long], [Define to a type of the same size as fd_set.fds_bits[[0]]]) AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [long long], [Define to a type of the same size as fd_set.fds_bits[[0]]])
fi ; fi ; fi fi
AC_MSG_CHECKING(for dladdr in dlfcn.h) AC_MSG_CHECKING(for dladdr in dlfcn.h)
PBX_DLADDR=0 PBX_DLADDR=0
...@@ -1544,11 +1543,9 @@ if test "${USE_GSM}" != "no"; then ...@@ -1544,11 +1543,9 @@ if test "${USE_GSM}" != "no"; then
if test "${GSM_HEADER_FOUND}" = "1" ; then if test "${GSM_HEADER_FOUND}" = "1" ; then
AC_DEFINE_UNQUOTED([HAVE_GSM_HEADER], 1, [Define to indicate that gsm.h has no prefix for its location]) AC_DEFINE_UNQUOTED([HAVE_GSM_HEADER], 1, [Define to indicate that gsm.h has no prefix for its location])
GSM_OK=1 GSM_OK=1
else elif test "${GSM_GSM_HEADER_FOUND}" = "1" ; then
if test "${GSM_GSM_HEADER_FOUND}" = "1" ; then AC_DEFINE_UNQUOTED([HAVE_GSM_GSM_HEADER], 1, [Define to indicate that gsm.h is in gsm/gsm.h])
AC_DEFINE_UNQUOTED([HAVE_GSM_GSM_HEADER], 1, [Define to indicate that gsm.h is in gsm/gsm.h]) GSM_OK=1
GSM_OK=1
fi
fi fi
if test "${GSM_OK}" = "1" ; then if test "${GSM_OK}" = "1" ; then
GSM_LIB="-lgsm" GSM_LIB="-lgsm"
...@@ -2345,32 +2342,17 @@ if test -z "$__opus_include" -o x"$__opus_include" = x" " ; then ...@@ -2345,32 +2342,17 @@ if test -z "$__opus_include" -o x"$__opus_include" = x" " ; then
fi fi
AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include]) AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
AST_EXT_LIB_CHECK([LUA], [lua5.3], [luaL_newstate], [lua5.3/lua.h], [-lm]) for ver in 5.3 5.2 5.1; do
if test "x${PBX_LUA}" = "x1" ; then AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm])
if test x"${LUA_DIR}" = x; then if test "x${PBX_LUA}" = "x1" ; then
LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.3" if test x"${LUA_DIR}" = x; then
else LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${ver}"
LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.3" else
fi LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${ver}"
fi fi
break;
AST_EXT_LIB_CHECK([LUA], [lua5.2], [luaL_newstate], [lua5.2/lua.h], [-lm])
if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then
LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.2"
else
LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.2"
fi
fi
AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h], [-lm])
if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then
LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"
else
LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"
fi fi
fi done
# Some distributions (like openSUSE and NetBSD) remove the 5.x suffix. # Some distributions (like openSUSE and NetBSD) remove the 5.x suffix.
AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm]) AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm])
...@@ -2710,9 +2692,9 @@ AC_OUTPUT ...@@ -2710,9 +2692,9 @@ AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2 ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
if test "x${ac_cv_path_CMP}" = "x:"; then if test "x${ac_cv_path_CMP}" = "x:"; then
( cd `pwd`/menuselect && ./configure ) ( cd `pwd`/menuselect && ./configure )
else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else elif ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
( cd `pwd`/menuselect && ./configure ) ( cd `pwd`/menuselect && ./configure )
fi ; fi fi
rm makeopts.acbak makeopts.acbak2 rm makeopts.acbak makeopts.acbak2
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment