diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-25 14:37:55 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-25 14:37:55 +0000 |
commit | f554d266c751f70183d42f1cee5e28608fa3a436 (patch) | |
tree | c8a19d6fa9f9ea03bc06e0322f5931cc741c1a73 | |
parent | 603a5334ddad6388646b16b203f2c7316dd52fd9 (diff) |
Merged revisions 66157 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66157 | kpfleming | 2007-05-25 10:28:46 -0400 (Fri, 25 May 2007) | 3 lines
handle the GNUTLS library properly in the configure script and build system
don't build in OSP support unless we have found and are allowed to use SSL support
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@66158 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_gtalk.c | 1 | ||||
-rw-r--r-- | channels/chan_jingle.c | 1 | ||||
-rwxr-xr-x | configure | 140 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | makeopts.in | 3 | ||||
-rw-r--r-- | res/res_jabber.c | 1 |
6 files changed, 81 insertions, 75 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 03b99f68e..f54a65f07 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -28,6 +28,7 @@ /*** MODULEINFO <depend>iksemel</depend> <depend>res_jabber</depend> + <use>gnutls</use> ***/ #include "asterisk.h" diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 22b4502b6..363d42a78 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -30,6 +30,7 @@ /*** MODULEINFO <depend>iksemel</depend> <depend>res_jabber</depend> + <use>gnutls</use> ***/ #include "asterisk.h" @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 66027 . +# From configure.ac Revision: 66071 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -18696,7 +18696,7 @@ 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="-lgnutls ${pbxlibdir} $LIBS" +LIBS="-lgnutls ${pbxlibdir} -lz -lgcrypt -lgpg-error $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -18761,18 +18761,18 @@ fi fi if test "${AST_GNUTLS_FOUND}" = "yes"; then - GNUTLS_LIB="-lgnutls " + GNUTLS_LIB="-lgnutls -lz -lgcrypt -lgpg-error" GNUTLS_HEADER_FOUND="1" if test "x${GNUTLS_DIR}" != "x"; then GNUTLS_LIB="${pbxlibdir} ${GNUTLS_LIB}" GNUTLS_INCLUDE="-I${GNUTLS_DIR}/include" saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} -I${GNUTLS_DIR}/include" - if test "x" != "x" ; then - as_ac_Header=`echo "ac_cv_header_${GNUTLS_DIR}/include/" | $as_tr_sh` + if test "xgnutls/gnutls.h" != "x" ; then + as_ac_Header=`echo "ac_cv_header_${GNUTLS_DIR}/include/gnutls/gnutls.h" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${GNUTLS_DIR}/include/" >&5 -echo $ECHO_N "checking for ${GNUTLS_DIR}/include/... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for ${GNUTLS_DIR}/include/gnutls/gnutls.h" >&5 +echo $ECHO_N "checking for ${GNUTLS_DIR}/include/gnutls/gnutls.h... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi @@ -18781,8 +18781,8 @@ ac_res=`eval echo '${'$as_ac_Header'}'` echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${GNUTLS_DIR}/include/ usability" >&5 -echo $ECHO_N "checking ${GNUTLS_DIR}/include/ usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${GNUTLS_DIR}/include/gnutls/gnutls.h usability" >&5 +echo $ECHO_N "checking ${GNUTLS_DIR}/include/gnutls/gnutls.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -18790,7 +18790,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <${GNUTLS_DIR}/include/> +#include <${GNUTLS_DIR}/include/gnutls/gnutls.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -18822,15 +18822,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking ${GNUTLS_DIR}/include/ presence" >&5 -echo $ECHO_N "checking ${GNUTLS_DIR}/include/ presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ${GNUTLS_DIR}/include/gnutls/gnutls.h presence" >&5 +echo $ECHO_N "checking ${GNUTLS_DIR}/include/gnutls/gnutls.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 <${GNUTLS_DIR}/include/> +#include <${GNUTLS_DIR}/include/gnutls/gnutls.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -18863,30 +18863,30 @@ 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: ${GNUTLS_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ${GNUTLS_DIR}/include/: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ${GNUTLS_DIR}/include/: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ${GNUTLS_DIR}/include/: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ${GNUTLS_DIR}/include/: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ${GNUTLS_DIR}/include/: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ${GNUTLS_DIR}/include/: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ${GNUTLS_DIR}/include/: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ${GNUTLS_DIR}/include/: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ${GNUTLS_DIR}/include/gnutls/gnutls.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for ${GNUTLS_DIR}/include/" >&5 -echo $ECHO_N "checking for ${GNUTLS_DIR}/include/... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for ${GNUTLS_DIR}/include/gnutls/gnutls.h" >&5 +echo $ECHO_N "checking for ${GNUTLS_DIR}/include/gnutls/gnutls.h... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18907,19 +18907,19 @@ fi fi CPPFLAGS="${saved_cppflags}" else - if test "x" != "x" ; then - if test "${ac_cv_header_+set}" = set; then - { echo "$as_me:$LINENO: checking for " >&5 -echo $ECHO_N "checking for ... $ECHO_C" >&6; } -if test "${ac_cv_header_+set}" = set; then + if test "xgnutls/gnutls.h" != "x" ; then + if test "${ac_cv_header_gnutls_gnutls_h+set}" = set; then + { echo "$as_me:$LINENO: checking for gnutls/gnutls.h" >&5 +echo $ECHO_N "checking for gnutls/gnutls.h... $ECHO_C" >&6; } +if test "${ac_cv_header_gnutls_gnutls_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_" >&5 -echo "${ECHO_T}$ac_cv_header_" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_gnutls_gnutls_h" >&5 +echo "${ECHO_T}$ac_cv_header_gnutls_gnutls_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking usability" >&5 -echo $ECHO_N "checking usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking gnutls/gnutls.h usability" >&5 +echo $ECHO_N "checking gnutls/gnutls.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -18927,7 +18927,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <> +#include <gnutls/gnutls.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -18959,15 +18959,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking presence" >&5 -echo $ECHO_N "checking presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking gnutls/gnutls.h presence" >&5 +echo $ECHO_N "checking gnutls/gnutls.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 <> +#include <gnutls/gnutls.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -19000,40 +19000,40 @@ 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: : accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: : accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: : proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: : proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: gnutls/gnutls.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: gnutls/gnutls.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: : present but cannot be compiled" >&5 -echo "$as_me: WARNING: : present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: : check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: : check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: : see the Autoconf documentation" >&5 -echo "$as_me: WARNING: : see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: : section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: : section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: : proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: : proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: : in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: : in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: gnutls/gnutls.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: gnutls/gnutls.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: gnutls/gnutls.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: gnutls/gnutls.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: gnutls/gnutls.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: gnutls/gnutls.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: gnutls/gnutls.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for " >&5 -echo $ECHO_N "checking for ... $ECHO_C" >&6; } -if test "${ac_cv_header_+set}" = set; then +{ echo "$as_me:$LINENO: checking for gnutls/gnutls.h" >&5 +echo $ECHO_N "checking for gnutls/gnutls.h... $ECHO_C" >&6; } +if test "${ac_cv_header_gnutls_gnutls_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_=$ac_header_preproc + ac_cv_header_gnutls_gnutls_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_" >&5 -echo "${ECHO_T}$ac_cv_header_" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_gnutls_gnutls_h" >&5 +echo "${ECHO_T}$ac_cv_header_gnutls_gnutls_h" >&6; } fi -if test $ac_cv_header_ = yes; then +if test $ac_cv_header_gnutls_gnutls_h = yes; then GNUTLS_HEADER_FOUND=1 else GNUTLS_HEADER_FOUND=0 @@ -19065,9 +19065,6 @@ _ACEOF fi fi - if test "${PBX_GNUTLS}" = 1; then - IKSEMEL_LIB="${IKSEMEL_LIB} -lgnutls -lz -lgcrypt -lgpg-error" - fi fi if test "${USE_IMAP_TK}" != "no"; then @@ -23075,6 +23072,8 @@ _ACEOF fi +if test "$PBX_OPENSSL" = "1"; +then if test "x${PBX_OSPTK}" != "x1" -a "${USE_OSPTK}" != "no"; then pbxlibdir="" @@ -23465,6 +23464,7 @@ _ACEOF fi fi +fi if test "x${PBX_BKTR}" != "x1" -a "${USE_BKTR}" != "no"; then diff --git a/configure.ac b/configure.ac index 185eb3d3e..1e85808a9 100644 --- a/configure.ac +++ b/configure.ac @@ -431,10 +431,7 @@ fi AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h]) if test "${PBX_IKSEMEL}" = 1; then - AST_EXT_LIB_CHECK([GNUTLS], [gnutls], [gnutls_bye]) - if test "${PBX_GNUTLS}" = 1; then - IKSEMEL_LIB="${IKSEMEL_LIB} -lgnutls -lz -lgcrypt -lgpg-error" - fi + AST_EXT_LIB_CHECK([GNUTLS], [gnutls], [gnutls_bye], [gnutls/gnutls.h], [-lz -lgcrypt -lgpg-error]) fi if test "${USE_IMAP_TK}" != "no"; then @@ -678,7 +675,10 @@ AST_EXT_LIB_CHECK([UNIXODBC], [odbc], [SQLConnect], [sql.h], [-lltdl]) AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], []) -AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl]) +if test "$PBX_OPENSSL" = "1"; +then + AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl]) +fi AST_EXT_LIB_CHECK([BKTR], [execinfo], [backtrace], [execinfo.h], [-lexecinfo]) diff --git a/makeopts.in b/makeopts.in index e2aeda7cd..69d12558e 100644 --- a/makeopts.in +++ b/makeopts.in @@ -90,6 +90,9 @@ GTK2_LIB=@GTK2_LIB@ IKSEMEL_INCLUDE=@IKSEMEL_INCLUDE@ IKSEMEL_LIB=@IKSEMEL_LIB@ +GNUTLS_INCLUDE=@GNUTLS_INCLUDE@ +GNUTLS_LIB=@GNUTLS_LIB@ + IMAP_TK_INCLUDE=@IMAP_TK_INCLUDE@ IMAP_TK_LIB=@IMAP_TK_LIB@ diff --git a/res/res_jabber.c b/res/res_jabber.c index d617aa76a..36937f28c 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -25,6 +25,7 @@ /*** MODULEINFO <depend>iksemel</depend> + <use>gnutls</use> ***/ #include "asterisk.h" |