[svn-commits] pcadach: branch pcadach/chan_h323-live r44536 - in
/team/pcadach/chan_h323-li...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Thu Oct 5 20:13:00 MST 2006
Author: pcadach
Date: Thu Oct 5 22:12:59 2006
New Revision: 44536
URL: http://svn.digium.com/view/asterisk?rev=44536&view=rev
Log:
Merged revisions 44527 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r44527 | russell | 2006-10-06 08:24:26 +0600 (Птн, 06 Окт 2006) | 3 lines
regenerate the configure script to reflect the latest changes done by
Luigi Rizzo
........
Modified:
team/pcadach/chan_h323-live/ (props changed)
team/pcadach/chan_h323-live/configure
team/pcadach/chan_h323-live/include/asterisk/autoconfig.h.in
Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Oct 5 22:12:59 2006
@@ -1,1 +1,1 @@
-/trunk:1-44524
+/trunk:1-44535
Modified: team/pcadach/chan_h323-live/configure
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure?rev=44536&r1=44535&r2=44536&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure (original)
+++ team/pcadach/chan_h323-live/configure Thu Oct 5 22:12:59 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 44045 .
+# From configure.ac Revision: 44475 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.60.
#
@@ -2034,6 +2034,8 @@
case "${host_os}" in
freebsd*)
ac_default_prefix=/usr/local
+ CPPFLAGS=-I/usr/local/include
+ LDFLAGS=-L/usr/local/lib
;;
*)
ac_default_prefix=/usr
@@ -5347,11 +5349,11 @@
USE_ALSA=no
;;
y|ye|yes)
- ALSA_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} ALSA"
;;
*)
ALSA_DIR="${withval}"
- ALSA_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} ALSA"
;;
esac
@@ -5374,11 +5376,11 @@
USE_CAP=no
;;
y|ye|yes)
- CAP_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} CAP"
;;
*)
CAP_DIR="${withval}"
- CAP_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} CAP"
;;
esac
@@ -5401,11 +5403,11 @@
USE_CURL=no
;;
y|ye|yes)
- CURL_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} CURL"
;;
*)
CURL_DIR="${withval}"
- CURL_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} CURL"
;;
esac
@@ -5428,11 +5430,11 @@
USE_CURSES=no
;;
y|ye|yes)
- CURSES_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} CURSES"
;;
*)
CURSES_DIR="${withval}"
- CURSES_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} CURSES"
;;
esac
@@ -5455,11 +5457,11 @@
USE_GNUTLS=no
;;
y|ye|yes)
- GNUTLS_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} GNUTLS"
;;
*)
GNUTLS_DIR="${withval}"
- GNUTLS_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} GNUTLS"
;;
esac
@@ -5482,11 +5484,11 @@
USE_GSM=no
;;
y|ye|yes)
- GSM_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} GSM"
;;
*)
GSM_DIR="${withval}"
- GSM_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} GSM"
;;
esac
@@ -5509,11 +5511,11 @@
USE_IKSEMEL=no
;;
y|ye|yes)
- IKSEMEL_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} IKSEMEL"
;;
*)
IKSEMEL_DIR="${withval}"
- IKSEMEL_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} IKSEMEL"
;;
esac
@@ -5536,11 +5538,11 @@
USE_IMAP_TK=no
;;
y|ye|yes)
- IMAP_TK_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} IMAP_TK"
;;
*)
IMAP_TK_DIR="${withval}"
- IMAP_TK_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} IMAP_TK"
;;
esac
@@ -5563,11 +5565,11 @@
USE_ISDNNET=no
;;
y|ye|yes)
- ISDNNET_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} ISDNNET"
;;
*)
ISDNNET_DIR="${withval}"
- ISDNNET_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} ISDNNET"
;;
esac
@@ -5590,11 +5592,11 @@
USE_KDE=no
;;
y|ye|yes)
- KDE_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} KDE"
;;
*)
KDE_DIR="${withval}"
- KDE_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} KDE"
;;
esac
@@ -5617,11 +5619,11 @@
USE_MISDN=no
;;
y|ye|yes)
- MISDN_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} MISDN"
;;
*)
MISDN_DIR="${withval}"
- MISDN_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} MISDN"
;;
esac
@@ -5644,11 +5646,11 @@
USE_NBS=no
;;
y|ye|yes)
- NBS_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} NBS"
;;
*)
NBS_DIR="${withval}"
- NBS_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} NBS"
;;
esac
@@ -5671,11 +5673,11 @@
USE_NCURSES=no
;;
y|ye|yes)
- NCURSES_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} NCURSES"
;;
*)
NCURSES_DIR="${withval}"
- NCURSES_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} NCURSES"
;;
esac
@@ -5698,11 +5700,11 @@
USE_NETSNMP=no
;;
y|ye|yes)
- NETSNMP_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} NETSNMP"
;;
*)
NETSNMP_DIR="${withval}"
- NETSNMP_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} NETSNMP"
;;
esac
@@ -5725,11 +5727,11 @@
USE_NEWT=no
;;
y|ye|yes)
- NEWT_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} NEWT"
;;
*)
NEWT_DIR="${withval}"
- NEWT_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} NEWT"
;;
esac
@@ -5752,11 +5754,11 @@
USE_UNIXODBC=no
;;
y|ye|yes)
- UNIXODBC_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} UNIXODBC"
;;
*)
UNIXODBC_DIR="${withval}"
- UNIXODBC_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} UNIXODBC"
;;
esac
@@ -5779,11 +5781,11 @@
USE_OGG=no
;;
y|ye|yes)
- OGG_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} OGG"
;;
*)
OGG_DIR="${withval}"
- OGG_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} OGG"
;;
esac
@@ -5806,11 +5808,11 @@
USE_OSPTK=no
;;
y|ye|yes)
- OSPTK_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} OSPTK"
;;
*)
OSPTK_DIR="${withval}"
- OSPTK_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} OSPTK"
;;
esac
@@ -5833,11 +5835,11 @@
USE_OSS=no
;;
y|ye|yes)
- OSS_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} OSS"
;;
*)
OSS_DIR="${withval}"
- OSS_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} OSS"
;;
esac
@@ -5860,11 +5862,11 @@
USE_POPT=no
;;
y|ye|yes)
- POPT_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} POPT"
;;
*)
POPT_DIR="${withval}"
- POPT_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} POPT"
;;
esac
@@ -5887,11 +5889,11 @@
USE_PGSQL=no
;;
y|ye|yes)
- PGSQL_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} PGSQL"
;;
*)
PGSQL_DIR="${withval}"
- PGSQL_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} PGSQL"
;;
esac
@@ -5914,11 +5916,11 @@
USE_PRI=no
;;
y|ye|yes)
- PRI_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} PRI"
;;
*)
PRI_DIR="${withval}"
- PRI_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} PRI"
;;
esac
@@ -5941,11 +5943,11 @@
USE_SS7=no
;;
y|ye|yes)
- SS7_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} SS7"
;;
*)
SS7_DIR="${withval}"
- SS7_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} SS7"
;;
esac
@@ -5968,11 +5970,11 @@
USE_PWLIB=no
;;
y|ye|yes)
- PWLIB_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} PWLIB"
;;
*)
PWLIB_DIR="${withval}"
- PWLIB_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} PWLIB"
;;
esac
@@ -5995,11 +5997,11 @@
USE_OPENH323=no
;;
y|ye|yes)
- OPENH323_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} OPENH323"
;;
*)
OPENH323_DIR="${withval}"
- OPENH323_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} OPENH323"
;;
esac
@@ -6022,11 +6024,11 @@
USE_QT=no
;;
y|ye|yes)
- QT_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} QT"
;;
*)
QT_DIR="${withval}"
- QT_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} QT"
;;
esac
@@ -6049,11 +6051,11 @@
USE_RADIUS=no
;;
y|ye|yes)
- RADIUS_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} RADIUS"
;;
*)
RADIUS_DIR="${withval}"
- RADIUS_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} RADIUS"
;;
esac
@@ -6076,11 +6078,11 @@
USE_SPEEX=no
;;
y|ye|yes)
- SPEEX_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} SPEEX"
;;
*)
SPEEX_DIR="${withval}"
- SPEEX_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} SPEEX"
;;
esac
@@ -6103,11 +6105,11 @@
USE_SQLITE=no
;;
y|ye|yes)
- SQLITE_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} SQLITE"
;;
*)
SQLITE_DIR="${withval}"
- SQLITE_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} SQLITE"
;;
esac
@@ -6130,11 +6132,11 @@
USE_SUPPSERV=no
;;
y|ye|yes)
- SUPPSERV_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} SUPPSERV"
;;
*)
SUPPSERV_DIR="${withval}"
- SUPPSERV_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} SUPPSERV"
;;
esac
@@ -6157,11 +6159,11 @@
USE_OPENSSL=no
;;
y|ye|yes)
- OPENSSL_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} OPENSSL"
;;
*)
OPENSSL_DIR="${withval}"
- OPENSSL_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} OPENSSL"
;;
esac
@@ -6184,11 +6186,11 @@
USE_FREETDS=no
;;
y|ye|yes)
- FREETDS_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} FREETDS"
;;
*)
FREETDS_DIR="${withval}"
- FREETDS_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} FREETDS"
;;
esac
@@ -6211,11 +6213,11 @@
USE_TERMCAP=no
;;
y|ye|yes)
- TERMCAP_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} TERMCAP"
;;
*)
TERMCAP_DIR="${withval}"
- TERMCAP_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} TERMCAP"
;;
esac
@@ -6238,11 +6240,11 @@
USE_TINFO=no
;;
y|ye|yes)
- TINFO_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} TINFO"
;;
*)
TINFO_DIR="${withval}"
- TINFO_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} TINFO"
;;
esac
@@ -6265,11 +6267,11 @@
USE_TONEZONE=no
;;
y|ye|yes)
- TONEZONE_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} TONEZONE"
;;
*)
TONEZONE_DIR="${withval}"
- TONEZONE_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} TONEZONE"
;;
esac
@@ -6292,11 +6294,11 @@
USE_VORBIS=no
;;
y|ye|yes)
- VORBIS_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} VORBIS"
;;
*)
VORBIS_DIR="${withval}"
- VORBIS_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} VORBIS"
;;
esac
@@ -6319,11 +6321,11 @@
USE_VPB=no
;;
y|ye|yes)
- VPB_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} VPB"
;;
*)
VPB_DIR="${withval}"
- VPB_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} VPB"
;;
esac
@@ -6346,11 +6348,11 @@
USE_ZLIB=no
;;
y|ye|yes)
- ZLIB_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} ZLIB"
;;
*)
ZLIB_DIR="${withval}"
- ZLIB_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} ZLIB"
;;
esac
@@ -6373,11 +6375,11 @@
USE_ZAPTEL=no
;;
y|ye|yes)
- ZAPTEL_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} ZAPTEL"
;;
*)
ZAPTEL_DIR="${withval}"
- ZAPTEL_MANDATORY="yes"
+ ac_mandatory_list="${ac_mandatory_list} ZAPTEL"
;;
esac
@@ -14336,10 +14338,18 @@
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-{ echo "$as_me:$LINENO: checking for RTLD_NOLOAD" >&5
-echo $ECHO_N "checking for RTLD_NOLOAD... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+
+ if test "x${PBX_RTLD_NOLOAD}" != "x1" -a "${USE_RTLD_NOLOAD}" != "no"; then
+ { echo "$as_me:$LINENO: checking for RTLD_NOLOAD in dlfcn.h" >&5
+echo $ECHO_N "checking for RTLD_NOLOAD in dlfcn.h... $ECHO_C" >&6; }
+ saved_cppflags="${CPPFLAGS}"
+ if test "x${RTLD_NOLOAD_DIR}" != "x"; then
+ RTLD_NOLOAD_INCLUDE= "-I${RTLD_NOLOAD_DIR}/include"
+ fi
+ CPPFLAGS="${CPPFLAGS} ${RTLD_NOLOAD_INCLUDE}"
+
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
@@ -14353,14 +14363,14 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+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_link") 2>conftest.er1
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -14377,7 +14387,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest.$ac_objext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
@@ -14387,24 +14397,33 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- { echo "$as_me:$LINENO: result: yes" >&5
+ { echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
+ PBX_RTLD_NOLOAD=1
cat >>confdefs.h <<\_ACEOF
#define HAVE_RTLD_NOLOAD 1
_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_RTLD_NOLOAD_VERSION
+_ACEOF
+
+
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- { echo "$as_me:$LINENO: result: no" >&5
+ { echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS="${saved_cppflags}"
+ fi
+
if test "${ac_cv_header_libkern_OSAtomic_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for libkern/OSAtomic.h" >&5
@@ -15069,7 +15088,7 @@
# do the package library checks now
-if test "${USE_ALSA}" != "no"; then
+if test "x${PBX_ALSA}" != "x1" -a "${USE_ALSA}" != "no"; then
pbxlibdir=""
if test "x${ALSA_DIR}" != "x"; then
if test -d ${ALSA_DIR}/lib; then
@@ -15078,9 +15097,14 @@
pbxlibdir="-L${ALSA_DIR}"
fi
fi
- { echo "$as_me:$LINENO: checking for snd_spcm_init in -lasound" >&5
-echo $ECHO_N "checking for snd_spcm_init in -lasound... $ECHO_C" >&6; }
-if test "${ac_cv_lib_asound_snd_spcm_init+set}" = set; then
+ pbxfuncname="snd_spcm_init"
+ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ AST_ALSA_FOUND=yes
+ else
+ as_ac_Lib=`echo "ac_cv_lib_asound_${pbxfuncname}" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lasound" >&5
+echo $ECHO_N "checking for ${pbxfuncname} in -lasound... $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
@@ -15098,11 +15122,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char snd_spcm_init ();
+char ${pbxfuncname} ();
int
main ()
{
-return snd_spcm_init ();
+return ${pbxfuncname} ();
;
return 0;
}
@@ -15141,26 +15165,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_asound_snd_spcm_init=yes
+ eval "$as_ac_Lib=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_asound_snd_spcm_init=no
+ eval "$as_ac_Lib=no"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_spcm_init" >&5
-echo "${ECHO_T}$ac_cv_lib_asound_snd_spcm_init" >&6; }
-if test $ac_cv_lib_asound_snd_spcm_init = yes; then
+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_ALSA_FOUND=yes
else
AST_ALSA_FOUND=no
fi
+ fi
if test "${AST_ALSA_FOUND}" = "yes"; then
ALSA_LIB="-lasound -lm -ldl"
@@ -15490,46 +15516,31 @@
fi
fi
if test "x${ALSA_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${ALSA_MANDATORY}" ;
- then
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** It appears that you do not have the asound development package installed." >&5
-echo "$as_me: *** It appears that you do not have the asound development package installed." >&6;}
- { echo "$as_me:$LINENO: *** Please install it to include ${ALSA_DESCRIP} support" >&5
-echo "$as_me: *** Please install it to include ${ALSA_DESCRIP} support" >&or re-run configure;}
- { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ALSA_OPTION}" >&5
-echo "$as_me: *** without explicitly specifying --with-${ALSA_OPTION}" >&6;}
- exit 1
- fi
ALSA_LIB=""
ALSA_INCLUDE=""
- PBX_ALSA=0
else
+ if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
+ ALSA_LIB=""
+ fi
PBX_ALSA=1
+ # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
cat >>confdefs.h <<_ACEOF
#define HAVE_ALSA 1
_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ALSA_VERSION
+_ACEOF
+
fi
- elif test ! -z "${ALSA_MANDATORY}";
- then
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** The ${ALSA_DESCRIP} installation on this system appears to be broken." >&5
-echo "$as_me: *** The ${ALSA_DESCRIP} installation on this system appears to be broken." >&6;}
- { echo "$as_me:$LINENO: *** Either correct the installation" >&5
-echo "$as_me: *** Either correct the installation" >&or run configure;}
- { echo "$as_me:$LINENO: *** without explicitly specifying --with-${ALSA_OPTION}" >&5
-echo "$as_me: *** without explicitly specifying --with-${ALSA_OPTION}" >&6;}
- exit 1
fi
fi
-if test "${USE_CURSES}" != "no"; then
+if test "x${PBX_CURSES}" != "x1" -a "${USE_CURSES}" != "no"; then
pbxlibdir=""
if test "x${CURSES_DIR}" != "x"; then
if test -d ${CURSES_DIR}/lib; then
@@ -15538,9 +15549,14 @@
pbxlibdir="-L${CURSES_DIR}"
fi
fi
- { echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5
-echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6; }
-if test "${ac_cv_lib_curses_initscr+set}" = set; then
+ pbxfuncname="initscr"
+ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ AST_CURSES_FOUND=yes
+ else
+ as_ac_Lib=`echo "ac_cv_lib_curses_${pbxfuncname}" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lcurses" >&5
+echo $ECHO_N "checking for ${pbxfuncname} in -lcurses... $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
@@ -15558,11 +15574,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char initscr ();
+char ${pbxfuncname} ();
int
main ()
{
-return initscr ();
+return ${pbxfuncname} ();
;
return 0;
}
@@ -15601,26 +15617,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_curses_initscr=yes
+ eval "$as_ac_Lib=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_curses_initscr=no
+ eval "$as_ac_Lib=no"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_curses_initscr" >&5
-echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6; }
-if test $ac_cv_lib_curses_initscr = yes; then
+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_CURSES_FOUND=yes
else
AST_CURSES_FOUND=no
fi
+ fi
if test "${AST_CURSES_FOUND}" = "yes"; then
CURSES_LIB="-lcurses "
@@ -15950,47 +15968,32 @@
fi
fi
if test "x${CURSES_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${CURSES_MANDATORY}" ;
- then
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** It appears that you do not have the curses development package installed." >&5
-echo "$as_me: *** It appears that you do not have the curses development package installed." >&6;}
- { echo "$as_me:$LINENO: *** Please install it to include ${CURSES_DESCRIP} support" >&5
-echo "$as_me: *** Please install it to include ${CURSES_DESCRIP} support" >&or re-run configure;}
- { echo "$as_me:$LINENO: *** without explicitly specifying --with-${CURSES_OPTION}" >&5
-echo "$as_me: *** without explicitly specifying --with-${CURSES_OPTION}" >&6;}
- exit 1
- fi
CURSES_LIB=""
CURSES_INCLUDE=""
- PBX_CURSES=0
else
+ if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
+ CURSES_LIB=""
+ fi
PBX_CURSES=1
+ # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
cat >>confdefs.h <<_ACEOF
#define HAVE_CURSES 1
_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_CURSES_VERSION
+_ACEOF
+
fi
- elif test ! -z "${CURSES_MANDATORY}";
- then
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** The ${CURSES_DESCRIP} installation on this system appears to be broken." >&5
-echo "$as_me: *** The ${CURSES_DESCRIP} installation on this system appears to be broken." >&6;}
- { echo "$as_me:$LINENO: *** Either correct the installation" >&5
-echo "$as_me: *** Either correct the installation" >&or run configure;}
- { echo "$as_me:$LINENO: *** without explicitly specifying --with-${CURSES_OPTION}" >&5
-echo "$as_me: *** without explicitly specifying --with-${CURSES_OPTION}" >&6;}
- exit 1
fi
fi
if test "x${host_os}" = "xlinux-gnu" ; then
-if test "${USE_CAP}" != "no"; then
+if test "x${PBX_CAP}" != "x1" -a "${USE_CAP}" != "no"; then
pbxlibdir=""
if test "x${CAP_DIR}" != "x"; then
if test -d ${CAP_DIR}/lib; then
@@ -15999,9 +16002,14 @@
pbxlibdir="-L${CAP_DIR}"
fi
fi
- { echo "$as_me:$LINENO: checking for cap_from_text in -lcap" >&5
-echo $ECHO_N "checking for cap_from_text in -lcap... $ECHO_C" >&6; }
-if test "${ac_cv_lib_cap_cap_from_text+set}" = set; then
+ pbxfuncname="cap_from_text"
+ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ AST_CAP_FOUND=yes
+ else
+ as_ac_Lib=`echo "ac_cv_lib_cap_${pbxfuncname}" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lcap" >&5
+echo $ECHO_N "checking for ${pbxfuncname} in -lcap... $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
@@ -16019,11 +16027,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char cap_from_text ();
+char ${pbxfuncname} ();
int
main ()
{
-return cap_from_text ();
+return ${pbxfuncname} ();
;
return 0;
}
@@ -16062,26 +16070,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_cap_cap_from_text=yes
+ eval "$as_ac_Lib=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_cap_cap_from_text=no
+ eval "$as_ac_Lib=no"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cap_cap_from_text" >&5
-echo "${ECHO_T}$ac_cv_lib_cap_cap_from_text" >&6; }
-if test $ac_cv_lib_cap_cap_from_text = yes; then
+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_CAP_FOUND=yes
else
AST_CAP_FOUND=no
fi
+ fi
if test "${AST_CAP_FOUND}" = "yes"; then
CAP_LIB="-lcap "
@@ -16411,40 +16421,25 @@
fi
fi
if test "x${CAP_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${CAP_MANDATORY}" ;
- then
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** It appears that you do not have the cap development package installed." >&5
-echo "$as_me: *** It appears that you do not have the cap development package installed." >&6;}
- { echo "$as_me:$LINENO: *** Please install it to include ${CAP_DESCRIP} support" >&5
-echo "$as_me: *** Please install it to include ${CAP_DESCRIP} support" >&or re-run configure;}
- { echo "$as_me:$LINENO: *** without explicitly specifying --with-${CAP_OPTION}" >&5
-echo "$as_me: *** without explicitly specifying --with-${CAP_OPTION}" >&6;}
- exit 1
- fi
CAP_LIB=""
CAP_INCLUDE=""
- PBX_CAP=0
else
+ if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
+ CAP_LIB=""
+ fi
PBX_CAP=1
+ # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
cat >>confdefs.h <<_ACEOF
#define HAVE_CAP 1
_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_CAP_VERSION
+_ACEOF
+
fi
- elif test ! -z "${CAP_MANDATORY}";
- then
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** The ${CAP_DESCRIP} installation on this system appears to be broken." >&5
-echo "$as_me: *** The ${CAP_DESCRIP} installation on this system appears to be broken." >&6;}
- { echo "$as_me:$LINENO: *** Either correct the installation" >&5
-echo "$as_me: *** Either correct the installation" >&or run configure;}
- { echo "$as_me:$LINENO: *** without explicitly specifying --with-${CAP_OPTION}" >&5
-echo "$as_me: *** without explicitly specifying --with-${CAP_OPTION}" >&6;}
- exit 1
fi
fi
@@ -16569,7 +16564,7 @@
fi
-if test "${USE_IKSEMEL}" != "no"; then
+if test "x${PBX_IKSEMEL}" != "x1" -a "${USE_IKSEMEL}" != "no"; then
pbxlibdir=""
if test "x${IKSEMEL_DIR}" != "x"; then
if test -d ${IKSEMEL_DIR}/lib; then
@@ -16578,9 +16573,14 @@
pbxlibdir="-L${IKSEMEL_DIR}"
fi
fi
- { echo "$as_me:$LINENO: checking for iks_start_sasl in -liksemel" >&5
-echo $ECHO_N "checking for iks_start_sasl in -liksemel... $ECHO_C" >&6; }
-if test "${ac_cv_lib_iksemel_iks_start_sasl+set}" = set; then
+ pbxfuncname="iks_start_sasl"
+ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ AST_IKSEMEL_FOUND=yes
+ else
+ as_ac_Lib=`echo "ac_cv_lib_iksemel_${pbxfuncname}" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -liksemel" >&5
+echo $ECHO_N "checking for ${pbxfuncname} in -liksemel... $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
@@ -16598,11 +16598,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char iks_start_sasl ();
+char ${pbxfuncname} ();
int
main ()
{
-return iks_start_sasl ();
+return ${pbxfuncname} ();
;
return 0;
}
@@ -16641,26 +16641,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_iksemel_iks_start_sasl=yes
+ eval "$as_ac_Lib=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_iksemel_iks_start_sasl=no
+ eval "$as_ac_Lib=no"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_iksemel_iks_start_sasl" >&5
-echo "${ECHO_T}$ac_cv_lib_iksemel_iks_start_sasl" >&6; }
-if test $ac_cv_lib_iksemel_iks_start_sasl = yes; then
+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_IKSEMEL_FOUND=yes
else
AST_IKSEMEL_FOUND=no
fi
+ fi
if test "${AST_IKSEMEL_FOUND}" = "yes"; then
IKSEMEL_LIB="-liksemel "
@@ -16990,47 +16992,32 @@
fi
fi
if test "x${IKSEMEL_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${IKSEMEL_MANDATORY}" ;
- then
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** It appears that you do not have the iksemel development package installed." >&5
-echo "$as_me: *** It appears that you do not have the iksemel development package installed." >&6;}
- { echo "$as_me:$LINENO: *** Please install it to include ${IKSEMEL_DESCRIP} support" >&5
-echo "$as_me: *** Please install it to include ${IKSEMEL_DESCRIP} support" >&or re-run configure;}
- { echo "$as_me:$LINENO: *** without explicitly specifying --with-${IKSEMEL_OPTION}" >&5
-echo "$as_me: *** without explicitly specifying --with-${IKSEMEL_OPTION}" >&6;}
- exit 1
- fi
IKSEMEL_LIB=""
IKSEMEL_INCLUDE=""
- PBX_IKSEMEL=0
else
+ if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
+ IKSEMEL_LIB=""
+ fi
PBX_IKSEMEL=1
+ # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
cat >>confdefs.h <<_ACEOF
#define HAVE_IKSEMEL 1
_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_IKSEMEL_VERSION
+_ACEOF
+
fi
- elif test ! -z "${IKSEMEL_MANDATORY}";
- then
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** The ${IKSEMEL_DESCRIP} installation on this system appears to be broken." >&5
-echo "$as_me: *** The ${IKSEMEL_DESCRIP} installation on this system appears to be broken." >&6;}
- { echo "$as_me:$LINENO: *** Either correct the installation" >&5
-echo "$as_me: *** Either correct the installation" >&or run configure;}
- { echo "$as_me:$LINENO: *** without explicitly specifying --with-${IKSEMEL_OPTION}" >&5
-echo "$as_me: *** without explicitly specifying --with-${IKSEMEL_OPTION}" >&6;}
- exit 1
fi
fi
if test "${PBX_IKSEMEL}" = 1; then
-if test "${USE_GNUTLS}" != "no"; then
+if test "x${PBX_GNUTLS}" != "x1" -a "${USE_GNUTLS}" != "no"; then
pbxlibdir=""
if test "x${GNUTLS_DIR}" != "x"; then
if test -d ${GNUTLS_DIR}/lib; then
@@ -17039,9 +17026,14 @@
pbxlibdir="-L${GNUTLS_DIR}"
fi
fi
- { echo "$as_me:$LINENO: checking for gnutls_bye in -lgnutls" >&5
-echo $ECHO_N "checking for gnutls_bye in -lgnutls... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gnutls_gnutls_bye+set}" = set; then
+ pbxfuncname="gnutls_bye"
+ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ AST_GNUTLS_FOUND=yes
+ else
+ as_ac_Lib=`echo "ac_cv_lib_gnutls_${pbxfuncname}" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lgnutls" >&5
+echo $ECHO_N "checking for ${pbxfuncname} in -lgnutls... $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
@@ -17059,11 +17051,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char gnutls_bye ();
+char ${pbxfuncname} ();
int
main ()
{
-return gnutls_bye ();
+return ${pbxfuncname} ();
;
return 0;
}
@@ -17102,26 +17094,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_gnutls_gnutls_bye=yes
+ eval "$as_ac_Lib=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_gnutls_gnutls_bye=no
+ eval "$as_ac_Lib=no"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gnutls_gnutls_bye" >&5
-echo "${ECHO_T}$ac_cv_lib_gnutls_gnutls_bye" >&6; }
-if test $ac_cv_lib_gnutls_gnutls_bye = yes; then
+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_GNUTLS_FOUND=yes
else
AST_GNUTLS_FOUND=no
fi
+ fi
if test "${AST_GNUTLS_FOUND}" = "yes"; then
GNUTLS_LIB="-lgnutls "
@@ -17451,40 +17445,25 @@
fi
fi
if test "x${GNUTLS_HEADER_FOUND}" = "x0" ; then
- if test ! -z "${GNUTLS_MANDATORY}" ;
- then
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** It appears that you do not have the gnutls development package installed." >&5
-echo "$as_me: *** It appears that you do not have the gnutls development package installed." >&6;}
- { echo "$as_me:$LINENO: *** Please install it to include ${GNUTLS_DESCRIP} support" >&5
-echo "$as_me: *** Please install it to include ${GNUTLS_DESCRIP} support" >&or re-run configure;}
- { echo "$as_me:$LINENO: *** without explicitly specifying --with-${GNUTLS_OPTION}" >&5
-echo "$as_me: *** without explicitly specifying --with-${GNUTLS_OPTION}" >&6;}
- exit 1
- fi
GNUTLS_LIB=""
GNUTLS_INCLUDE=""
- PBX_GNUTLS=0
else
+ if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
+ GNUTLS_LIB=""
+ fi
PBX_GNUTLS=1
+ # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
cat >>confdefs.h <<_ACEOF
#define HAVE_GNUTLS 1
_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_GNUTLS_VERSION
+_ACEOF
+
fi
- elif test ! -z "${GNUTLS_MANDATORY}";
- then
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** The ${GNUTLS_DESCRIP} installation on this system appears to be broken." >&5
-echo "$as_me: *** The ${GNUTLS_DESCRIP} installation on this system appears to be broken." >&6;}
- { echo "$as_me:$LINENO: *** Either correct the installation" >&5
-echo "$as_me: *** Either correct the installation" >&or run configure;}
- { echo "$as_me:$LINENO: *** without explicitly specifying --with-${GNUTLS_OPTION}" >&5
-echo "$as_me: *** without explicitly specifying --with-${GNUTLS_OPTION}" >&6;}
- exit 1
fi
fi
@@ -17744,18 +17723,6 @@
_ACEOF
fi
- elif test ! -z "${IMAP_TK_MANDATORY}"; then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** The UW IMAP Toolkit installation on this system appears to be broken." >&5
-echo "$as_me: *** The UW IMAP Toolkit installation on this system appears to be broken." >&6;}
- { echo "$as_me:$LINENO: *** Either correct the installation" >&5
-echo "$as_me: *** Either correct the installation" >&or run configure;}
- { echo "$as_me:$LINENO: *** including --without-imap." >&5
-echo "$as_me: *** including --without-imap." >&6;}
- exit 1
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
@@ -17861,18 +17828,6 @@
#define HAVE_LIBKDE 1
_ACEOF
- elif test ! -z "${KDE_MANDATORY}"; then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
- { echo "$as_me:$LINENO: *** The KDE installation on this system appears to be broken." >&5
-echo "$as_me: *** The KDE installation on this system appears to be broken." >&6;}
- { echo "$as_me:$LINENO: *** Either correct the installation" >&5
-echo "$as_me: *** Either correct the installation" >&or run configure;}
- { echo "$as_me:$LINENO: *** including --without-kde." >&5
-echo "$as_me: *** including --without-kde." >&6;}
- exit 1
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
@@ -17996,7 +17951,7 @@
-if test "${USE_MISDN}" != "no"; then
+if test "x${PBX_MISDN}" != "x1" -a "${USE_MISDN}" != "no"; then
pbxlibdir=""
if test "x${MISDN_DIR}" != "x"; then
if test -d ${MISDN_DIR}/lib; then
@@ -18005,9 +17960,14 @@
pbxlibdir="-L${MISDN_DIR}"
fi
fi
- { echo "$as_me:$LINENO: checking for mISDN_open in -lmISDN" >&5
-echo $ECHO_N "checking for mISDN_open in -lmISDN... $ECHO_C" >&6; }
-if test "${ac_cv_lib_mISDN_mISDN_open+set}" = set; then
+ pbxfuncname="mISDN_open"
+ if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
+ AST_MISDN_FOUND=yes
+ else
+ as_ac_Lib=`echo "ac_cv_lib_mISDN_${pbxfuncname}" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lmISDN" >&5
+echo $ECHO_N "checking for ${pbxfuncname} in -lmISDN... $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
@@ -18025,11 +17985,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char mISDN_open ();
+char ${pbxfuncname} ();
int
main ()
{
-return mISDN_open ();
+return ${pbxfuncname} ();
;
return 0;
}
@@ -18068,26 +18028,28 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_mISDN_mISDN_open=yes
+ eval "$as_ac_Lib=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_mISDN_mISDN_open=no
+ eval "$as_ac_Lib=no"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mISDN_mISDN_open" >&5
-echo "${ECHO_T}$ac_cv_lib_mISDN_mISDN_open" >&6; }
-if test $ac_cv_lib_mISDN_mISDN_open = yes; then
+ac_res=`eval echo '${'$as_ac_Lib'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
[... 4928 lines stripped ...]
More information about the svn-commits
mailing list