mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 12:16:00 +00:00
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: https://origsvn.digium.com/svn/asterisk/branches/1.4@66157 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
138
configure
vendored
138
configure
vendored
@@ -17734,7 +17734,7 @@ if test "${ac_cv_lib_gnutls_gnutls_bye+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
|
||||
@@ -17797,18 +17797,18 @@ 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
|
||||
@@ -17817,8 +17817,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
|
||||
@@ -17826,7 +17826,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"
|
||||
@@ -17858,15 +17858,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
|
||||
@@ -17899,30 +17899,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
|
||||
@@ -17943,19 +17943,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
|
||||
@@ -17963,7 +17963,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"
|
||||
@@ -17995,15 +17995,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
|
||||
@@ -18036,40 +18036,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
|
||||
@@ -18116,9 +18116,6 @@ echo "$as_me: *** without explicitly specifying --with-${GNUTLS_OPTION}" >&6;}
|
||||
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
|
||||
@@ -22236,6 +22233,8 @@ echo "$as_me: *** without explicitly specifying --with-${OGG_OPTION}" >&6;}
|
||||
fi
|
||||
|
||||
|
||||
if test "$PBX_OPENSSL" = "1";
|
||||
then
|
||||
|
||||
if test "${USE_OSPTK}" != "no"; then
|
||||
pbxlibdir=""
|
||||
@@ -22634,6 +22633,7 @@ echo "$as_me: *** without explicitly specifying --with-${OSPTK_OPTION}" >&6;}
|
||||
fi
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
if test "${USE_OSS}" != "no"; then
|
||||
PBX_OSS=0
|
||||
|
||||
Reference in New Issue
Block a user