From a7498ae02e750221a0307e04a572af752a414ba2 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Wed, 26 May 2010 00:29:40 +0000 Subject: [PATCH] Use configure to determine the prefixes and include directories properly. This ensures cross-platform compatibility, even among Linux distributions, which don't always put headers in the same place. (closes issue #17391) Reported by: loloski git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@265747 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- configure | 533 ++++++++++++++++--------------- configure.ac | 13 +- include/asterisk/autoconfig.h.in | 3 - pbx/pbx_lua.c | 6 - res/res_calendar_caldav.c | 10 +- res/res_calendar_ews.c | 16 +- res/res_calendar_exchange.c | 10 +- res/res_calendar_icalendar.c | 10 +- 8 files changed, 301 insertions(+), 300 deletions(-) diff --git a/configure b/configure index 025b34b81a..fc1b6cc965 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 263905 . +# From configure.ac Revision: 264249 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -25378,265 +25378,6 @@ fi - -if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then - pbxlibdir="" - # if --with-ICAL=DIR has been specified, use it. - if test "x${ICAL_DIR}" != "x"; then - if test -d ${ICAL_DIR}/lib; then - pbxlibdir="-L${ICAL_DIR}/lib" - else - pbxlibdir="-L${ICAL_DIR}" - fi - fi - pbxfuncname="icaltimezone_new" - if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers - AST_ICAL_FOUND=yes - else - ast_ext_lib_check_save_CFLAGS="${CFLAGS}" - CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" - as_ac_Lib=`echo "ac_cv_lib_ical_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lical" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -lical... $ECHO_C" >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lical ${pbxlibdir} ${PTHREAD_LIBS} $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 ${pbxfuncname} (); -int -main () -{ -return ${pbxfuncname} (); - ; - return 0; -} -_ACEOF -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_link") 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_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then - AST_ICAL_FOUND=yes -else - AST_ICAL_FOUND=no -fi - - CFLAGS="${ast_ext_lib_check_save_CFLAGS}" - fi - - # now check for the header. - if test "${AST_ICAL_FOUND}" = "yes"; then - ICAL_LIB="${pbxlibdir} -lical ${PTHREAD_LIBS}" - # if --with-ICAL=DIR has been specified, use it. - if test "x${ICAL_DIR}" != "x"; then - ICAL_INCLUDE="-I${ICAL_DIR}/include" - fi - ICAL_INCLUDE="${ICAL_INCLUDE} ${PTHREAD_CFLAGS}" - if test "xical.h" = "x" ; then # no header, assume found - ICAL_HEADER_FOUND="1" - else # check for the header - ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${ICAL_INCLUDE}" - if test "${ac_cv_header_ical_h+set}" = set; then - { echo "$as_me:$LINENO: checking for ical.h" >&5 -echo $ECHO_N "checking for ical.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ical_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ical_h" >&5 -echo "${ECHO_T}$ac_cv_header_ical_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ical.h usability" >&5 -echo $ECHO_N "checking ical.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_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 - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking ical.h presence" >&5 -echo $ECHO_N "checking ical.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -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_cpp conftest.$ac_ext") 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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ical.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ical.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ical.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ical.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ical.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ical.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ical.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ical.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ical.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ical.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ical.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ical.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ical.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ical.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ical.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ical.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------- ## -## Report this to www.asterisk.org ## -## ------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for ical.h" >&5 -echo $ECHO_N "checking for ical.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ical_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_ical_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ical_h" >&5 -echo "${ECHO_T}$ac_cv_header_ical_h" >&6; } - -fi -if test $ac_cv_header_ical_h = yes; then - ICAL_HEADER_FOUND=1 -else - ICAL_HEADER_FOUND=0 -fi - - - CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" - fi - if test "x${ICAL_HEADER_FOUND}" = "x0" ; then - ICAL_LIB="" - ICAL_INCLUDE="" - else - if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library - ICAL_LIB="" - fi - PBX_ICAL=1 - cat >>confdefs.h <<_ACEOF -#define HAVE_ICAL 1 -_ACEOF - - fi - fi -fi - - - # Some distributions (like RedHat) add a libical subdirectory for the headers if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then @@ -25896,6 +25637,268 @@ _ACEOF fi +if test x"${PBX_ICAL}" = x1; then + ICAL_INCLUDE+=-I/usr/include/libical +fi + + +if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then + pbxlibdir="" + # if --with-ICAL=DIR has been specified, use it. + if test "x${ICAL_DIR}" != "x"; then + if test -d ${ICAL_DIR}/lib; then + pbxlibdir="-L${ICAL_DIR}/lib" + else + pbxlibdir="-L${ICAL_DIR}" + fi + fi + pbxfuncname="icaltimezone_new" + if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers + AST_ICAL_FOUND=yes + else + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" + as_ac_Lib=`echo "ac_cv_lib_ical_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lical" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lical... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lical ${pbxlibdir} ${PTHREAD_LIBS} $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* 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 ${pbxfuncname} (); +int +main () +{ +return ${pbxfuncname} (); + ; + return 0; +} +_ACEOF +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_link") 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_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_Lib=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Lib=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + AST_ICAL_FOUND=yes +else + AST_ICAL_FOUND=no +fi + + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" + fi + + # now check for the header. + if test "${AST_ICAL_FOUND}" = "yes"; then + ICAL_LIB="${pbxlibdir} -lical ${PTHREAD_LIBS}" + # if --with-ICAL=DIR has been specified, use it. + if test "x${ICAL_DIR}" != "x"; then + ICAL_INCLUDE="-I${ICAL_DIR}/include" + fi + ICAL_INCLUDE="${ICAL_INCLUDE} ${PTHREAD_CFLAGS}" + if test "xical.h" = "x" ; then # no header, assume found + ICAL_HEADER_FOUND="1" + else # check for the header + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${ICAL_INCLUDE}" + if test "${ac_cv_header_ical_h+set}" = set; then + { echo "$as_me:$LINENO: checking for ical.h" >&5 +echo $ECHO_N "checking for ical.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ical_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_ical_h" >&5 +echo "${ECHO_T}$ac_cv_header_ical_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking ical.h usability" >&5 +echo $ECHO_N "checking ical.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_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 + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking ical.h presence" >&5 +echo $ECHO_N "checking ical.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 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); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: ical.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ical.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ical.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: ical.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ical.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ical.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ical.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ical.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ical.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ical.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------- ## +## Report this to www.asterisk.org ## +## ------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for ical.h" >&5 +echo $ECHO_N "checking for ical.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ical_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_ical_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_ical_h" >&5 +echo "${ECHO_T}$ac_cv_header_ical_h" >&6; } + +fi +if test $ac_cv_header_ical_h = yes; then + ICAL_HEADER_FOUND=1 +else + ICAL_HEADER_FOUND=0 +fi + + + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" + fi + if test "x${ICAL_HEADER_FOUND}" = "x0" ; then + ICAL_LIB="" + ICAL_INCLUDE="" + else + if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + ICAL_LIB="" + fi + PBX_ICAL=1 + cat >>confdefs.h <<_ACEOF +#define HAVE_ICAL 1 +_ACEOF + + fi + fi +fi + + if test "x${PBX_IKSEMEL}" != "x1" -a "${USE_IKSEMEL}" != "no"; then @@ -40590,11 +40593,11 @@ fi if test "x${PBX_LUA}" = "x1" ; then - -cat >>confdefs.h <<_ACEOF -#define LUA51_PREFIX 1 -_ACEOF - + 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 # Some distributions (like SuSE) remove the 5.1 suffix. diff --git a/configure.ac b/configure.ac index 944860e0d5..ce2fb73e2d 100644 --- a/configure.ac +++ b/configure.ac @@ -921,10 +921,13 @@ AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h]) # Some versions of Linux package iconv in glibc AST_EXT_LIB_CHECK([ICONV], [c], [iconv_close], [iconv.h]) -AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_new], [ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}]) - # Some distributions (like RedHat) add a libical subdirectory for the headers AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_get_utc_timezone], [libical/ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}]) +if test x"${PBX_ICAL}" = x1; then + ICAL_INCLUDE+=-I/usr/include/libical +fi + +AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_new], [ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}]) AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h]) @@ -1662,7 +1665,11 @@ fi AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h], [-lm]) if test "x${PBX_LUA}" = "x1" ; then - AC_DEFINE_UNQUOTED([LUA51_PREFIX], [1], [Define to 1 if lua is found with a lua5.1 prefix]) + 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 # Some distributions (like SuSE) remove the 5.1 suffix. diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index f6e1dae7c7..70e34113be 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -1020,9 +1020,6 @@ slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK -/* Define to 1 if lua is found with a lua5.1 prefix */ -#undef LUA51_PREFIX - /* Build chan_misdn for mISDN 1.2 or later. */ #undef MISDN_1_2 diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c index 2aac40951e..e292117a38 100644 --- a/pbx/pbx_lua.c +++ b/pbx/pbx_lua.c @@ -42,15 +42,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/paths.h" #include "asterisk/hashtab.h" -#ifdef LUA51_PREFIX -#include -#include -#include -#else #include #include #include -#endif static char *config = "extensions.lua"; static char *registrar = "pbx_lua"; diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c index 5cf9c99aaa..63b6a6ba6a 100644 --- a/res/res_calendar_caldav.c +++ b/res/res_calendar_caldav.c @@ -29,11 +29,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/res/res_calendar_ews.c b/res/res_calendar_ews.c index bd6a1eecd2..17723b569c 100644 --- a/res/res_calendar_ews.c +++ b/res/res_calendar_ews.c @@ -27,14 +27,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "asterisk/module.h" #include "asterisk/calendar.h" diff --git a/res/res_calendar_exchange.c b/res/res_calendar_exchange.c index a681466233..2c121bc967 100644 --- a/res/res_calendar_exchange.c +++ b/res/res_calendar_exchange.c @@ -29,11 +29,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include "asterisk/module.h" diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c index 096eac1d09..8c0966528c 100644 --- a/res/res_calendar_icalendar.c +++ b/res/res_calendar_icalendar.c @@ -28,11 +28,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "asterisk/module.h" #include "asterisk/calendar.h"