Thread: [Opalvoip-svn] SF.net SVN: opalvoip:[20667] ptlib/trunk
Brought to you by:
csoutheren,
rjongbloed
Menu
▾
▴
opalvoip-svn
|
From: <rjo...@us...> - 2008-08-15 05:25:58
|
Revision: 20667
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20667&view=rev
Author: rjongbloed
Date: 2008-08-15 05:26:08 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
Added support for converting AC_CONFIG_FILES() under Windows.
Modified Paths:
--------------
ptlib/trunk/configure.ac
ptlib/trunk/configure.exe
ptlib/trunk/tools/configure/configure.cpp
Property Changed:
----------------
ptlib/trunk/
Property changes on: ptlib/trunk
___________________________________________________________________
Modified: svn:ignore
- Lib
Debug
Release
*.suo
*.ncb
*.opt
*.plg
*.Tags.WW
config.log
config.status
a.out
Makefile
html
bin
lib
ptlib_cfg.dxy
+ Lib
Debug
Release
*.suo
*.ncb
*.opt
*.plg
*.Tags.WW
config.log
config.status
a.out
Makefile
html
bin
lib
ptlib_cfg.dxy
ptlib.pc
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-14 07:33:04 UTC (rev 20666)
+++ ptlib/trunk/configure.ac 2008-08-15 05:26:08 UTC (rev 20667)
@@ -2543,11 +2543,10 @@
AC_CONFIG_FILES([make/ptlib-config], [chmod a+x make/ptlib-config])
AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(ptlib_cfg.dxy)
-AC_CONFIG_FILES([ptlib.pc])
+AC_CONFIG_FILES(ptlib.pc)
dnl ########################################################################
dnl output header file
-#AC_CONFIG_FILES(include/ptbuildopts.h.in)
AC_CONFIG_HEADERS(include/ptbuildopts.h)
AC_OUTPUT()
Modified: ptlib/trunk/configure.exe
===================================================================
--- ptlib/trunk/configure.exe 2008-08-14 07:33:04 UTC (rev 20666)
+++ ptlib/trunk/configure.exe 2008-08-15 05:26:08 UTC (rev 20667)
@@ -1,286 +1,284 @@
MZ\x90 |
|
From: <dsa...@us...> - 2008-08-17 11:55:42
|
Revision: 20673
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20673&view=rev
Author: dsandras
Date: 2008-08-17 11:55:51 +0000 (Sun, 17 Aug 2008)
Log Message:
-----------
Small build fixes thanks to Mr M.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
ptlib/trunk/src/ptlib/msos/Makefile
ptlib/trunk/src/ptlib/msos/vfw.cxx
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-15 08:32:41 UTC (rev 20672)
+++ ptlib/trunk/configure 2008-08-17 11:55:51 UTC (rev 20673)
@@ -1393,6 +1393,12 @@
--disable-odbc disable ODBC support
--enable-exceptions enable C++ exceptions
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-directx-includedir=DIR
+ Location of DirectX include files
+
Some influential environment variables:
CC C compiler command
CFLAGS C compiler flags
@@ -1826,8 +1832,8 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ENDLDLIBS="$ENDLDLIBS -lasound"
-
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -3154,10 +3160,13 @@
+
+
+
PTLIBDIR=`pwd`
+9
-
if test "x$prefix" = "xNONE"; then
INSTALLPREFIX="/usr/local"
else
@@ -3351,6 +3360,11 @@
OSRELEASE="\"`uname -r`\"";
OS_TAG="P_LINUX" ;
need_pragma=yes ;
+
+cat >>confdefs.h <<\_ACEOF
+#define P_PTHREADS 1
+_ACEOF
+
;;
freebsd* ) OSTYPE=FreeBSD ;
@@ -3359,6 +3373,11 @@
OSRELEASE="`sysctl -n kern.osreldate`" ;
fi
need_pragma=yes ;
+
+cat >>confdefs.h <<\_ACEOF
+#define P_PTHREADS 1
+_ACEOF
+
;;
openbsd* ) OSTYPE=OpenBSD ;
@@ -3366,6 +3385,11 @@
OSRELEASE="`sysctl -n kern.osrevision`" ;
ENDLDLIBS="-lossaudio" ;
need_pragma=yes ;
+
+cat >>confdefs.h <<\_ACEOF
+#define P_PTHREADS 1
+_ACEOF
+
;;
netbsd* ) OSTYPE=NetBSD ;
@@ -3373,12 +3397,22 @@
OSRELEASE="`/sbin/sysctl -n kern.osrevision`" ;
ENDLDLIBS="-lossaudio" ;
need_pragma=yes ;
+
+cat >>confdefs.h <<\_ACEOF
+#define P_PTHREADS 1
+_ACEOF
+
;;
solaris* | sunos* ) OSTYPE=solaris ;
OS_TAG="P_SOLARIS" ;
OSRELEASE=`uname -r | sed "s/5\.//g"` ;
need_pragma=yes ;
+
+cat >>confdefs.h <<\_ACEOF
+#define P_PTHREADS 1
+_ACEOF
+
;;
darwin* ) OSTYPE=Darwin ;
@@ -3391,6 +3425,11 @@
if test -e /Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/include/expat.h ; then
EXPATDIR=/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6
fi
+
+cat >>confdefs.h <<\_ACEOF
+#define P_PTHREADS 1
+_ACEOF
+
;;
beos*) OSTYPE=beos ;
@@ -3410,7 +3449,7 @@
TARGETDIR=msos ;
SHAREDLIBEXT="dll" ;
STDCCFLAGS="$STDCCFLAGS -mms-bitfields" ;
- ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32" ;
+ ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32 -liphlpapi -lole32" ;
NEEDS_PTHREADS=no ;
;;
@@ -3520,14 +3559,7 @@
fi
-if test ${OSTYPE} != beos ; then
-cat >>confdefs.h <<\_ACEOF
-#define P_PTHREADS 1
-_ACEOF
-
-fi
-
if test ${OSTYPE} != solaris ; then
LDAP_LIBRARIES="-llber -lldap_r"
fi
@@ -7257,21 +7289,23 @@
# Check whether --enable-resolver was given.
if test "${enable_resolver+set}" = set; then
- enableval=$enable_resolver;
+ enableval=$enable_resolver; enable_resolver=$enableval
+else
+ enable_resolver=$default_resolver
+
fi
-if test "${enable_resolver}z" = "z" ; then
- enable_resolver=$default_resolver
-fi
-
HAS_RESOLVER=
if test "$enable_resolver" = "no" ; then
{ echo "$as_me:$LINENO: DNS resolver disabled" >&5
echo "$as_me: DNS resolver disabled" >&6;}
else
- { echo "$as_me:$LINENO: checking for res_ninit" >&5
+ ptlib_has_resolver=no
+ HAS_RES_NINIT=
+
+ { echo "$as_me:$LINENO: checking for res_ninit" >&5
echo $ECHO_N "checking for res_ninit... $ECHO_C" >&6; }
if test "${ac_cv_func_res_ninit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7353,29 +7387,26 @@
{ echo "$as_me:$LINENO: result: $ac_cv_func_res_ninit" >&5
echo "${ECHO_T}$ac_cv_func_res_ninit" >&6; }
if test $ac_cv_func_res_ninit = yes; then
- HAS_RES_NINIT
+
+ HAS_RES_NINIT=1
+ ptlib_has_resolver=yes
+
fi
- if test "${HAS_RES_NINIT}z" != "z" ; then
- cat >>confdefs.h <<\_ACEOF
-#define P_HAS_RES_NINIT 1
-_ACEOF
- HAS_RESOLVER=1
- RESOLVER_LIBS=""
- fi
-
- if test "${HAS_RESOLVER}z" = "z" ; then
- { echo "$as_me:$LINENO: checking for res_ninit in -lresolv" >&5
+ if test "x${ptlib_has_resolver}" = "xno" ; then
+ { echo "$as_me:$LINENO: checking for res_ninit in -lresolv" >&5
echo $ECHO_N "checking for res_ninit in -lresolv... $ECHO_C" >&6; }
- LIBS="-lresolv"
- cat >conftest.$ac_ext <<_ACEOF
+ old_LIBS="$LIBS"
+ LIBS="$LIBS -lresolv"
+ cat >conftest.$ac_ext <<_ACEOF
-#include <netinet/in.h>
-#include <resolv.h>
-int main(int argc,char **argv){
- res_state p; res_ninit(p);
-}
+ #include <netinet/in.h>
+ #include <resolv.h>
+ int main(int argc,char **argv) {
+ res_state p; res_ninit(p);
+ }
+
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
@@ -7395,7 +7426,11 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- HAS_RES_NINIT=1
+
+ HAS_RES_NINIT=1
+ ptlib_has_resolver=yes
+ RESOLVER_LIBS="-lresolv"
+
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7405,24 +7440,13 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
- if test "${HAS_RES_NINIT}z" != "z" ; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- cat >>confdefs.h <<\_ACEOF
-#define P_HAS_RES_NINIT 1
-_ACEOF
+ LIBS="${old_LIBS}"
+ { echo "$as_me:$LINENO: result: ${ptlib_has_resolver}" >&5
+echo "${ECHO_T}${ptlib_has_resolver}" >&6; }
+ fi
- HAS_RESOLVER=1
- RESOLVER_LIBS="-lresolv"
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- fi
- LIBS=""
- fi
-
- if test "${HAS_RESOLVER}z" = "z" ; then
- { echo "$as_me:$LINENO: checking for res_search" >&5
+ if test "x${ptlib_has_resolver}" = "xno" ; then
+ { echo "$as_me:$LINENO: checking for res_search" >&5
echo $ECHO_N "checking for res_search... $ECHO_C" >&6; }
if test "${ac_cv_func_res_search+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7504,25 +7528,24 @@
{ echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5
echo "${ECHO_T}$ac_cv_func_res_search" >&6; }
if test $ac_cv_func_res_search = yes; then
- HAS_RESOLVER=1
+ ptlib_has_resolver=yes
fi
- if test "${HAS_RESOLVER}z" != "z" ; then
- RESOLVER_LIBS=""
- fi
- fi
+ fi
- if test "${HAS_RESOLVER}z" = "z" ; then
- { echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
+ if test "x${ptlib_has_resolver}" = "xno" ; then
+ { echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; }
- LIBS="-lresolv"
- cat >conftest.$ac_ext <<_ACEOF
+ old_LIBS="$LIBS"
+ LIBS="$LIBS -lresolv"
+ cat >conftest.$ac_ext <<_ACEOF
-#include <netinet/in.h>
-#include <resolv.h>
-int main(int argc,char **argv){
- res_search (NULL, 0, 0, NULL, 0);
-}
+ #include <netinet/in.h>
+ #include <resolv.h>
+ int main(int argc,char **argv){
+ res_search (NULL, 0, 0, NULL, 0);
+ }
+
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
@@ -7542,7 +7565,10 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- HAS_RESOLVER=1
+
+ ptlib_has_resolver=yes
+ RESOLVER_LIBS="-lresolv"
+
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7552,19 +7578,99 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
- if test "${HAS_RESOLVER:-unset}" != "unset" ; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- RESOLVER_LIBS="-lresolv"
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- fi
- LIBS=""
+ LIBS="${old_LIBS}"
+ { echo "$as_me:$LINENO: result: ${ptlib_has_resolver}" >&5
+echo "${ECHO_T}${ptlib_has_resolver}" >&6; }
+ fi
+
+ if test "x${ptlib_has_resolver}" = "xno" ; then
+ { echo "$as_me:$LINENO: checking for library containing __res_search" >&5
+echo $ECHO_N "checking for library containing __res_search... $ECHO_C" >&6; }
+if test "${ac_cv_search___res_search+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_func_search_save_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 __res_search ();
+int
+main ()
+{
+return __res_search ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' resolv; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
+ 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_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_search___res_search=$ac_res
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- if test "${HAS_RESOLVER}z" = "z" ; then
- { echo "$as_me:$LINENO: checking for library containing __res_search" >&5
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ if test "${ac_cv_search___res_search+set}" = set; then
+ break
+fi
+done
+if test "${ac_cv_search___res_search+set}" = set; then
+ :
+else
+ ac_cv_search___res_search=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search___res_search" >&5
+echo "${ECHO_T}$ac_cv_search___res_search" >&6; }
+ac_res=$ac_cv_search___res_search
+if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ ptlib_has_resolver=yes
+fi
+
+ fi
+
+ if test "x${ptlib_has_resolver}" = "xno" ; then
+ { echo "$as_me:$LINENO: checking for library containing __res_search" >&5
echo $ECHO_N "checking for library containing __res_search... $ECHO_C" >&6; }
if test "${ac_cv_search___res_search+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7644,24 +7750,183 @@
ac_res=$ac_cv_search___res_search
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ ptlib_has_resolver=yes
+fi
+
+ fi
+
+ if test "x${ptlib_has_resolver}" = "xno" ; then
+
+for ac_header in windns.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_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 $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+ ptlib_has_resolver=yes
+ RESOLVER_LIBS="-ldnsapi"
+
+fi
+
+done
+
+ fi
+ if test $ptlib_has_resolver = yes; then
HAS_RESOLVER=1
+else
+ HAS_RESOLVER=
fi
- fi
- if test "${HAS_RESOLVER}z" != "z" ; then
+ if test "x${HAS_RESOLVER}" = "x1" ; then
+
cat >>confdefs.h <<\_ACEOF
#define P_DNS 1
_ACEOF
- HAS_RESOLVER=1
+ if test "${HAS_RES_NINIT}z" != "z" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define P_HAS_RES_NINIT 1
+_ACEOF
+
+ fi
fi
fi
+
# Check whether --enable-sasl was given.
if test "${enable_sasl+set}" = set; then
enableval=$enable_sasl;
@@ -8141,7 +8406,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap $LDAP_LIBRARIES $RESOLVER_LIBS $ENDLDLIBS $OPENLDAPSYSLIBS $LIBS"
+LIBS="-lldap $LDAP_LIBRARIES $RESOLVER_LIBS $ENDLDLIBS $OPENLDAPSYSLIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -10262,9 +10527,8 @@
fi
HAS_VIDEO=
-HAS_VIDEO_CAPTURE=
-if test "$enable_video" = "no" ; then
+if test "x$enable_video" = "xno" ; then
cat >>confdefs.h <<\_ACEOF
#define NO_VIDEO_CAPTURE
@@ -10276,10 +10540,1357 @@
_ACEOF
HAS_VIDEO=1
- if test "$enable_plugins" = "yes" ; then
+fi
+
+
+HAS_VIDEO_CAPTURE=
+if test "x$enable_video" != "xno" ; then
+ if test "x$enable_plugins" = "xyes" ; then
HAS_VIDEO_CAPTURE=1
else
- if test "${ac_cv_header_linux_videodev_h+set}" = set; then
+ case "$target_os" in
+ cygwin* | mingw* )
+
+ ptlib_has_directx=yes
+ DIRECTX_INCLUDES=
+ DIRECTX_LIBS=
+
+
+# Check whether --with-directx-includedir was given.
+if test "${with_directx_includedir+set}" = set; then
+ withval=$with_directx_includedir; with_directx_dir="$withval"
+else
+ with_directx_dir="include"
+
+fi
+
+
+ { echo "$as_me:$LINENO: checking for DirectX includes in ${with_directx_dir}" >&5
+echo $ECHO_N "checking for DirectX includes in ${with_directx_dir}... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: " >&5
+echo "${ECHO_T}" >&6; }
+
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -I${with_directx_dir}"
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+
+for ac_header in mingw_dshow_port.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_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 $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+ ptlib_has_directx=no
+fi
+
+done
+
+
+for ac_header in control.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_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 $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+ ptlib_has_directx=no
+fi
+
+done
+
+
+for ac_header in ddraw.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_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 $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+ ptlib_has_directx=no
+fi
+
+done
+
+
+for ac_header in dshow.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_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 $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+ ptlib_has_directx=no
+fi
+
+done
+
+
+for ac_header in dsound.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_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 $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+ ptlib_has_directx=no
+fi
+
+done
+
+
+for ac_header in dxerr9.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_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 $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+ ptlib_has_directx=no
+fi
+
+done
+
+
+for ac_header in ksuuids.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_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 $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+ ptlib_has_directx=no
+fi
+
+done
+
+
+for ac_header in strmif.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_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 $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header 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 <$ac_header>
+_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }...
[truncated message content] |
|
From: <dsa...@us...> - 2008-08-18 17:26:26
|
Revision: 20685
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20685&view=rev
Author: dsandras
Date: 2008-08-18 17:26:33 +0000 (Mon, 18 Aug 2008)
Log Message:
-----------
Improved build thanks to Mr M.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
ptlib/trunk/make/unix.mak
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-18 09:21:13 UTC (rev 20684)
+++ ptlib/trunk/configure 2008-08-18 17:26:33 UTC (rev 20685)
@@ -651,6 +651,7 @@
host_alias
target_alias
subdirs
+PKG_CONFIG
CC
CFLAGS
LDFLAGS
@@ -698,10 +699,13 @@
HAS_REGEX
HAS_PLUGINS
HAS_SAMPLES
+CPP
HAS_RESOLVER
HAS_SASL
HAS_SASL2
HAS_OPENLDAP
+OPENSSL_CFLAGS
+OPENSSL_LIBS
HAS_OPENSSL
P_STATIC_ENDLDLIBS
P_STATIC_LDFLAGS
@@ -717,6 +721,8 @@
HAS_SOAP
HAS_TTS
HAS_IPV6
+SDL_CFLAGS
+SDL_LIBS
HAS_SDL
HAS_VIDEO
HAS_VIDEO_CAPTURE
@@ -754,6 +760,7 @@
ac_precious_vars='build_alias
host_alias
target_alias
+PKG_CONFIG
CC
CFLAGS
LDFLAGS
@@ -762,7 +769,12 @@
CXX
CXXFLAGS
CCC
-CXXCPP'
+CXXCPP
+CPP
+OPENSSL_CFLAGS
+OPENSSL_LIBS
+SDL_CFLAGS
+SDL_LIBS'
ac_subdirs_all='plugins'
# Initialize some variables set by options.
@@ -1400,6 +1412,7 @@
Location of DirectX include files
Some influential environment variables:
+ PKG_CONFIG path to pkg-config utility
CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1410,6 +1423,13 @@
CXX C++ compiler command
CXXFLAGS C++ compiler flags
CXXCPP C++ preprocessor
+ CPP C preprocessor
+ OPENSSL_CFLAGS
+ C compiler flags for OPENSSL, overriding pkg-config
+ OPENSSL_LIBS
+ linker flags for OPENSSL, overriding pkg-config
+ SDL_CFLAGS C compiler flags for SDL, overriding pkg-config
+ SDL_LIBS linker flags for SDL, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1834,6 +1854,11 @@
+if test \! -e ./aclocal.m4 ; then
+ echo "ERROR: you must run 'aclocal' before 'autoconf'"
+ exit
+fi
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -1868,6 +1893,126 @@
subdirs="$subdirs plugins"
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3163,10 +3308,21 @@
+
+
+
+
+
+
+
+
+
+
+
PTLIBDIR=`pwd`
-9
+
if test "x$prefix" = "xNONE"; then
INSTALLPREFIX="/usr/local"
else
@@ -6925,25 +7081,10 @@
-LIBS=""
-HAS_LIBDL=no
-P_DYNALINK=0
-if test ${OSTYPE} = beos ; then
- P_DYNALINK=1
-cat >>confdefs.h <<\_ACEOF
-#define P_DYNALINK 1
-_ACEOF
-elif test ${OSTYPE} = Darwin ; then
- P_DYNALINK=1
+ ptlib_libdl=no
-cat >>confdefs.h <<\_ACEOF
-#define P_DYNALINK 1
-_ACEOF
-
-else
-
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -7078,17 +7219,23 @@
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- HAS_DLFCN=yes
+ ptlib_dlfcn=yes
else
- HAS_DLFCN=no
+ ptlib_dlfcn=no
fi
done
- if test "$HAS_DLFCN" = yes ; then
- { echo "$as_me:$LINENO: checking if dlopen is available" >&5
+ if test "$ptlib_dlfcn" = yes ; then
+ { echo "$as_me:$LINENO: checking if dlopen is available" >&5
echo $ECHO_N "checking if dlopen is available... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -7117,31 +7264,99 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- HAS_DLOPEN=yes
+ ptlib_dlopen=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- HAS_DLOPEN=no
+ ptlib_dlopen=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test "$HAS_DLOPEN" = no ; then
- { echo "$as_me:$LINENO: result: no" >&5
+ if test "$ptlib_dlopen" = no ; then
+ { echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
- else
- { echo "$as_me:$LINENO: result: yes" >&5
+ else
+ { echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- P_DYNALINK=1
+ case "$target_os" in
+ freebsd*|openbsd*|netbsd*|darwin*|beos*)
+ { echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
+echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6; }
+if test "${ac_cv_lib_c_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-cat >>confdefs.h <<\_ACEOF
-#define P_DYNALINK 1
+/* 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 dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ 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
+ ac_cv_lib_c_dlopen=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+ ac_cv_lib_c_dlopen=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
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_c_dlopen" >&6; }
+if test $ac_cv_lib_c_dlopen = yes; then
+
+ ptlib_libdl=yes
+ DL_LIBS="-lc"
+
+else
+ ptlib_libdl=no
+fi
+
+ ;;
+ *)
+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7184,7 +7399,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -7203,14 +7418,32 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
if test $ac_cv_lib_dl_dlopen = yes; then
+
+ ptlib_libdl=yes
+ DL_LIBS="-ldl"
+
+else
+ ptlib_libdl=no
+fi
+
+ ;;
+ esac
+ fi
+ fi
+ if test $ptlib_libdl = yes; then
HAS_LIBDL=yes
else
HAS_LIBDL=no
fi
- fi
+
+if test "x$HAS_LIBDL" = "xyes" ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_DYNALINK 1
+_ACEOF
+
fi
-fi
@@ -7230,7 +7463,7 @@
if test "${enable_plugins}" = "no" ; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-elif test "${P_DYNALINK:-unset}" = "unset" ; then
+elif test "x${HAS_LIBDL}" != "xyes" ; then
{ echo "$as_me:$LINENO: result: plugins disabled as dlopen not available" >&5
echo "${ECHO_T}plugins disabled as dlopen not available" >&6; }
else
@@ -7301,7 +7534,238 @@
{ echo "$as_me:$LINENO: DNS resolver disabled" >&5
echo "$as_me: DNS resolver disabled" >&6;}
else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if test "${ac_cv_prog_CPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_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
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_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
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_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
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_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
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
ptlib_has_resolver=no
HAS_RES_NINIT=
@@ -7369,7 +7833,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -7422,7 +7886,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -7510,7 +7974,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -7561,7 +8025,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -7633,7 +8097,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -7719,7 +8183,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -7796,7 +8260,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
@@ -7835,7 +8299,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
@@ -7851,7 +8315,7 @@
echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
@@ -7976,7 +8440,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -8024,7 +8488,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -8071,7 +8535,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
HAS_INCLUDE_SASL_H=1
@@ -8110,7 +8574,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
P_HAS_SASL_SASL_H=1
@@ -8204,7 +8668,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -8294,7 +8758,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
@@ -8333,7 +8797,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
@@ -8349,7 +8813,7 @@
echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
@@ -8443,7 +8907,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -8535,7 +8999,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -8585,300 +9049,106 @@
-
# Check whether --enable-openssl was given.
if test "${enable_openssl+set}" = set; then
- enableval=$enable_openssl;
+ enableval=$enable_openssl; enable_openssl=$enableval
+else
+ enable_openssl=$default_openssl
+
fi
-if test "${enable_openssl}z" = "z" ; then
- enable_openssl=$default_openssl
-fi
-
-HAS_OPENSSL=
if test "$enable_openssl" = "no" ; then
{ echo "$as_me:$LINENO: OpenSSL disabled" >&5
echo "$as_me: OpenSSL disabled" >&6;}
else
- if test ${OPENSSLDIR:-unset} != "unset" ; then
- { echo "$as_me:$LINENO: checking for ${OPENSSLDIR}/include/openssl/ssl.h" >&5
-echo $ECHO_N "checking for ${OPENSSLDIR}/include/openssl/ssl.h... $ECHO_C" >&6; }
- if test -e ${OPENSSLDIR}/include/openssl/ssl.h ; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- SSLHDR=1
- SSLINCLUDEDIR="${OPENSSLDIR}/include"
- SSLLIBDIR="${OPENSSLDIR}/lib"
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for OPENSSL" >&5
+echo $ECHO_N "checking for OPENSSL... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$OPENSSL_CFLAGS"; then
+ pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- fi
- fi
-
-
- if test "${SSLHDR:-unset}" = "unset" ; then
-
-for ac_header in openssl/ssl.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header 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 <$ac_header>
-_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
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
+ ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
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_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+ (exit $ac_status); }; then
+ pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
+ pkg_failed=yes
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 $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header 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 <$ac_header>
-_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
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$OPENSSL_LIBS"; then
+ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
+ ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
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_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
+ (exit $ac_status); }; then
+ pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
+ pkg_failed=yes
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_cxx_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
else
- eval "$as_ac_Header=\$ac_header_preproc"
+ pkg_failed=untried
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- SSLHDR=1
-fi
-done
- if test "${SSLHDR:-unset}" = "unset" ; then
- { echo "$as_me:$LINENO: checking if openssl/ssl.h works with OPENSSL_NO_KRB5" >&5
-echo $ECHO_N "checking if openssl/ssl.h works with OPENSSL_NO_KRB5... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-#define OPENSSL_NO_KRB5
-#include <openssl/ssl.h>
-int main(int argc,char **argv){}
-_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_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- SSLHDR=1
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+ _pkg_short_errors_supported=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test "${SSLHDR:-unset}" != "unset" ; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- SSLCCFLAGS=" -DOPENSSL_NO_KRB5"
- P_STATIC_LDFLAGS="$P_STATIC_LDFLAGS -L/usr/kerberos/lib"
- if test ${OSTYPE} = linux ; then
- P_STATIC_ENDLDLIBS="-lkrb5 -lk5crypto -lcom_err"
+ if test $_pkg_short_errors_supported = yes; then
+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
+ else
+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
fi
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- fi
- fi
- fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$OPENSSL_PKG_ERRORS" >&5
- if test "${SSLHDR:-unset}" = "unset" ; then
-
- for openssl_dir in /usr/local/openssl /usr/local/ssl ; do
- { echo "$as_me:$LINENO: checking for OpenSSL in $openssl_dir" >&5
-echo $ECHO_N "checking for OpenSSL in $openssl_dir... $ECHO_C" >&6; }
- if test ! -f ${openssl_dir}/include/openssl/ssl.h ; then
- { echo "$as_me:$LINENO: result: no" >&5
+ { echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
- else
- cat >conftest.$ac_ext <<_ACEOF
-#include "${openssl_dir}/include/openssl/ssl.h"
-int main(int argc,char **argv){ return 0; }
-_ACEOF
- $CXX $CXXFLAGS -I${openssl_dir}/include -c conftest.$ac_ext > /dev/null 2>&1
- if test $? = 0 ; then
- { echo "$as_me:$LINENO: result: yes" >&5
+ HAS_OPENSSL=
+elif test $pkg_failed = untried; then
+ HAS_OPENSSL=
+else
+ OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
+ OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- SSLHDR=1
- SSLCCFLAGS=""
- SSLINCLUDEDIR="${openssl_dir}/include"
- SSLLIBDIR="${openssl_dir}/lib"
- break
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { echo "$as_me:$LINENO: checking if ${openssl_dir}/include/openssl/ssl.h works with OPENSSL_NO_KRB5..." >&5
-echo $ECHO_N "checking if ${openssl_dir}/include/openssl/ssl.h works with OPENSSL_NO_KRB5...... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-#define OPENSSL_NO_KRB5
-#include "${openssl_dir}/include/openssl/ssl.h"
-int main(int argc,char **argv){}
-_ACEOF
- $CXX $CXXFLAGS -I${openssl_dir}/openssl/include -c conftest.$ac_ext > /dev/null 2>&1
- if test $? = 0 ; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- SSLHDR=1
- SSLCCFLAGS=" -DOPENSSL_NO_KRB5"
- SSLINCLUDEDIR="${openssl_dir}/include"
- SSLLIBDIR="${openssl_dir}/lib"
- P_STATIC_LDFLAGS="$P_STATIC_LDFLAGS -L/usr/kerberos/lib"
- if test ${OSTYPE} = linux ; then
- P_STATIC_ENDLDLIBS="-lkrb5 -lk5crypto -lcom_err"
- fi
- break
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- fi
- fi
- fi
- done
- fi
- if test ${SSLHDR:-unset} != "unset" ; then
+ HAS_OPENSSL=1
cat >>confdefs.h <<\_ACEOF
#define P_OSSL 1
_ACEOF
- HAS_OPENSSL=1
- if test ${SSLINCLUDEDIR:-unset} != "unset" ; then
- STDCCFLAGS="$STDCCFLAGS -I${SSLINCLUDEDIR}"
- fi
- if test ${SSLLIBDIR:-unset} != "unset" ; then
- LDFLAGS="$LDFLAGS -L${SSLLIBDIR}"
- fi
- STDCCFLAGS="${STDCCFLAGS}${SSLCCFLAGS}"
- ENDLDLIBS="$ENDLDLIBS -lssl -lcrypto"
+ ptlib_openssl_aes=no
+ old_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
for ac_header in openssl/aes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -8918,7 +9188,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
@@ -8957,7 +9227,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
@@ -8973,7 +9243,7 @@
echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
@@ -9013,24 +9283,40 @@
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- HAS_SSL_AES=yes
-else
- HAS_SSL_AES=no
+ ptlib_openssl_aes=yes
fi
done
- if test "$HAS_SSL_AES" = yes ; then
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ CFLAGS="${old_CFLAGS}"
+ if test $ptlib_openssl_aes = yes; then
+
cat >>confdefs.h <<\_ACEOF
#define P_OSSL_AES 1
_ACEOF
- fi
+fi
- { echo "$as_me:$LINENO: checking for const arg to d2i_AutoPrivateKey" >&5
+
+
+ ptlib_openssl_const=no
+ old_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ { echo "$as_me:$LINENO: checking for const arg to d2i_AutoPrivateKey" >&5
echo $ECHO_N "checking for const arg to d2i_AutoPrivateKey... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -9040,9 +9326,10 @@
int
main ()
{
- EVP_PKEY **a; const unsigned char **p; long l;
- d2i_AutoPrivateKey(a, p, l);
+ EVP_PKEY **a; const unsigned char **p; long l;
+ d2i_AutoPrivateKey(a, p, l);
+
;
return 0;
}
@@ -9061,10 +9348,11 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- P_SSL_USE_CONST=yes
+ ptlib_openssl_const=yes
+
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9073,28 +9361,39 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test "${P_SSL_USE_CONST}x" = "x" ; then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- else
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { echo "$as_me:$LINENO: result: ${ptlib_openssl_const}" >&5
+echo "${ECHO_T}${ptlib_openssl_const}" >&6; }
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ CFLAGS="${old_CFLAGS}"
+
+ if test $ptlib_openssl_const = yes; then
+
cat >>confdefs.h <<\_ACEOF
#define P_SSL_USE_CONST 1
_ACEOF
- fi
- fi
fi
+ STDCCFLAGS="$STDCCFLAGS ${OPENSSL_CFLAGS}"
+ ENDLDLIBS="$ENDLDLIBS ${OPENSSL_LIBS}"
+fi
+fi
+
+
+
+
# Check whether --enable-configfile was given.
if test "${enable_configfile+set}" = set; then
enableval=$enable_configfile;
@@ -10125,397 +10424,146 @@
# Check whether --enable-sdl was given.
if test "${enable_sdl+set}" = set; then
- enableval=$enable_sdl;
+ enableval=$enable_sdl; enable_sdl=$enableval
+else
+ enable_sdl=$default_sdl
+
fi
-if test "${enable_sdl}z" = "z" ; then
- enable_sdl=$default_sdl
-fi
-
HAS_SDL=
if test "$enable_sdl" = "no" ; then
{ echo "$as_me:$LINENO: SDL disabled" >&5
echo "$as_me: SDL disabled" >&6;}
- cat >>confdefs.h <<\_ACEOF
-#define P_SDL 0
-_ACEOF
-
else
- if test "${SDLLIB:-unset}" = "unset" ; then
- SDLLIB=SDL
- fi
-for ac_header in SDL/SDL.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header 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 <$ac_header>
-_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
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for SDL" >&5
+echo $ECHO_N "checking for SDL... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$SDL_CFLAGS"; then
+ pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5
+ ($PKG_CONFIG --exists --print-errors "sdl") 2>&5
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_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+ (exit $ac_status); }; then
+ pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl" 2>/dev/null`
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
+ pkg_failed=yes
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 $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header 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 <$ac_header>
-_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
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$SDL_LIBS"; then
+ pkg_cv_SDL_LIBS="$SDL_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5
+ ($PKG_CONFIG --exists --print-errors "sdl") 2>&5
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_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
+ (exit $ac_status); }; then
+ pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl" 2>/dev/null`
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
+ pkg_failed=yes
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_cxx_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
else
- eval "$as_ac_Header=\$ac_header_preproc"
+ pkg_failed=untried
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- HAS_SDL=1
-fi
-done
- if test "${HAS_SDL:-unset}" != "unset" ; then
- if test "${X11LIBDIR:-unset}" == "unset" ; then
- X11LIBDIR=/usr/X11R6/lib
- fi
- { echo "$as_me:$LINENO: checking for SDL_CreateYUVOverlay in -lSDL" >&5
-echo $ECHO_N "checking for SDL_CreateYUVOverlay in -lSDL... $ECHO_C" >&6; }
-if test "${ac_cv_lib_SDL_SDL_CreateYUVOverlay+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL -L${X11LIBDIR} -lpthread -lX11 -lXext $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+if test $pkg_failed = yes; then
-/* 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 SDL_CreateYUVOverlay ();
-int
-main ()
-{
-return SDL_CreateYUVOverlay ();
- ;
- 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_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_SDL_SDL_CreateYUVOverlay=yes
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_SDL_SDL_CreateYUVOverlay=no
+ _pkg_short_errors_supported=no
fi
+ if test $_pkg_short_errors_supported = yes; then
+ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl"`
+ else
+ SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SDL_PKG_ERRORS" >&5
-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
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_CreateYUVOverlay" >&5
-echo "${ECHO_T}$ac_cv_lib_SDL_SDL_CreateYUVOverlay" >&6; }
-if test $ac_cv_lib_SDL_SDL_CreateYUVOverlay = yes; then
- HAS_SDL=1
-else
- HAS_SDL=
-fi
+ { { echo "$as_me:$LINENO: error: Package requirements (sdl) were not met:
- fi
+$SDL_PKG_ERRORS
- if test "${HAS_SDL:-unset}" = "unset" ; then
- if test "${ac_cv_header_SDL11_SDL_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for SDL11/SDL.h" >&5
-echo $ECHO_N "checking for SDL11/SDL.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_SDL11_SDL_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_SDL11_SDL_h" >&5
-echo "${ECHO_T}$ac_cv_header_SDL11_SDL_h" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking SDL11/SDL.h usability" >&5
-echo $ECHO_N "checking SDL11/SDL.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 <SDL11/SDL.h>
-_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_cxx_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
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
- ac_header_compiler=no
-fi
+Alternatively, you may set the environment variables SDL_CFLAGS
+and SDL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (sdl) were not met:
-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; }
+$SDL_PKG_ERRORS
-# Is the header present?
-{ echo "$as_me:$LINENO: checking SDL11/SDL.h presence" >&5
-echo $ECHO_N "checking SDL11/SDL.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 <SDL11/SDL.h>
-_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_cxx_preproc_warn_flag$ac_cxx_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
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
- ac_header_preproc=no
-fi
+Alternatively, you may set the environment variables SDL_CFLAGS
+and SDL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+Alternatively, you may set the environment variables SDL_CFLAGS
+and SDL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: SDL11/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: SDL11/SDL.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: SDL11/SDL.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: SDL11/SDL.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: SDL11/SDL.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: SDL11/SDL.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: SDL11/SDL.h: in the future, the compiler will take precedence" >&2;}
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for SDL11/SDL.h" >&5
-echo $ECHO_N "checking for SDL11/SDL.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_SDL11_SDL_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+Alternatively, you may set the environment variables SDL_CFLAGS
+and SDL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
else
- ac_cv_header_SDL11_SDL_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_SDL11_SDL_h" >&5
-echo "${ECHO_T}$ac_cv_header_SDL11_SDL_h" >&6; }
+ SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+ SDL_LIBS=$pkg_cv_SDL_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
-fi
-if test $ac_cv_header_SDL11_SDL_h = yes; then
- HAS_SDL=1
-fi
+ HAS_SDL=1
-
- if test "${HAS_SDL:-unset}" != "unset" ; then
- SDLLIB=SDL-1.1
- fi
- fi
-
- if test "${HAS_SDL:-unset}" != "unset" ; then
- HAS_SDL=1
-
cat >>confdefs.h <<\_ACEOF
#define P_SDL 1
_ACEOF
- if test ${SDLINCLUDEDIR:-unset} != "unset" ; then
- STDCCFLAGS="$STDCCFLAGS -I${SDLINCLUDEDIR}"
- fi
- if test ${SDLLIBDIR:-unset} != "unset" ; then
- LDFLAGS="$LDFLAGS -L${SDLLIBDIR}"
- fi
- ENDLDLIBS="$ENDLDLIBS -l${SDLLIB}"
- fi
+ STDCCFLAGS="$STDCCFLAGS ${SDL_CFLAGS}"
+ ENDLDLIBS="$ENDLDLIBS ${SDL_LIBS}"
+
fi
+fi
+
# Check whether --enable-video was given.
if test "${enable_video+set}" = set; then
enableval=$enable_video;
@@ -13220,14 +13268,13 @@
if test "${HAS_RESOLVER:-unset}" != "unset" ; then
if test "${RESOLVER_LIBS:-unset}" != "unset" ; then
- ENDLDLIBS="$ENDLDLIBS $RESOLVER_LIBS"
+ ENDLDLIBS="$ENDLDLIBS ${RESOLVER_LIBS}"
fi
fi
-if test "${OSTYPE}" != "Darwin" ; then
- if test ${HAS_LIBDL} = yes ; then
- ENDLDLIBS="$ENDLDLIBS -ldl"
- fi
+if test "x${HAS_LIBDL}" = "xyes" ; then
+ ENDLDLIBS="$ENDLDLIBS $DL_LIBS"
+ STDCCFLAGS="$STDCCFLAGS $DL_CFLAGS"
fi
@@ -14013,6 +14060,7 @@
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
subdirs!$subdirs$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -14060,18 +14108,17 @@
HAS_REGEX!$HAS_REGEX$ac_delim
HAS_PLUGINS!$HAS_PLUGINS$ac_delim
HAS_SAMPLES!$HAS_SAMPLES$ac_delim
+CPP!$CPP$ac_delim
HAS_RESOLVER!$HAS_RESOLVER$ac_delim
HAS_SASL!$HAS_SASL$ac_delim
HAS_SASL2!$HAS_SASL2$ac_delim
HAS_OPENLDAP!$HAS_OPENLDAP$ac_delim
+OPENSSL_CFLAGS!$OPENSSL_CFLAGS$ac_delim
+OPENSSL_LIBS!$OPENSSL_LIBS$ac_delim
HAS_OPENSSL!$HAS_OPENSSL$ac_delim
P_STATIC_ENDLDLIBS!$P_STATIC_ENDLDLIBS$ac_delim
P_STATIC_LDFLAGS!$P_STATIC_LDFLAGS$ac_delim
HAS_CONFIG_FILE!$HAS_CONFIG_FILE$ac_delim
-HAS_URL!$HAS_URL$ac_delim
-HAS_HTTP!$HAS_HTTP$ac_delim
-HAS_HTTPFORMS!$HAS_HTTPFORMS$ac_delim
-HAS_HTTPSVC!$HAS_HTTPSVC$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -14113,6 +14160,10 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+HAS_URL!$HAS_URL$ac_delim
+HAS_HTTP!$HAS_HTTP$ac_delim
+HAS_HTTPFORMS!$HAS_HTTPFORMS$ac_delim
+HAS_HTTPSVC!$HAS_HTTPSVC$ac_delim
HAS_EXP...
[truncated message content] |
|
From: Robert J. <ro...@vo...> - 2008-08-19 01:39:48
|
The configure system is now broken. First I got: klatch robertj/ptlib> ./configure ERROR: you must run 'aclocal' before 'autoconf' Then when I figured out I needed an aclocal.m4 and to get then I run aclocal I got: checking for SDL... configure: error: Package requirements (sdl) were not met: No package 'sdl' found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables SDL_CFLAGS and SDL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. Even though SDL is installed on my system, a SUSE 11, which is pretty new. The problem is not that it can't find SDL, but that the entire configure process stops! Can we please do what we did last time and do all of these build system changes in a branch until it has been tried on a few different systems? I think this might take a little while to bed in. Robert Jongbloed OPAL/OpenH323 Architect and Co-founder. > -----Original Message----- > From: opa...@li... [mailto:opalvoip- > svn...@li...] On Behalf Of > dsa...@us... > Sent: Tuesday, 19 August 2008 3:27 AM > To: opa...@li... > Subject: [Opalvoip-svn] SF.net SVN: opalvoip:[20685] ptlib/trunk > > Revision: 20685 > > http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20685&view=rev > Author: dsandras > Date: 2008-08-18 17:26:33 +0000 (Mon, 18 Aug 2008) > > Log Message: > ----------- > Improved build thanks to Mr M. > > Modified Paths: > -------------- > ptlib/trunk/configure > ptlib/trunk/configure.ac > ptlib/trunk/make/unix.mak > > Modified: ptlib/trunk/configure > =================================================================== > --- ptlib/trunk/configure 2008-08-18 09:21:13 UTC (rev 20684) > +++ ptlib/trunk/configure 2008-08-18 17:26:33 UTC (rev 20685) > @@ -651,6 +651,7 @@ > host_alias > target_alias > subdirs > +PKG_CONFIG > CC > CFLAGS > LDFLAGS > @@ -698,10 +699,13 @@ > HAS_REGEX > HAS_PLUGINS > HAS_SAMPLES > +CPP > HAS_RESOLVER > HAS_SASL > HAS_SASL2 > HAS_OPENLDAP > +OPENSSL_CFLAGS > +OPENSSL_LIBS > HAS_OPENSSL > P_STATIC_ENDLDLIBS > P_STATIC_LDFLAGS > @@ -717,6 +721,8 @@ > HAS_SOAP > HAS_TTS > HAS_IPV6 > +SDL_CFLAGS > +SDL_LIBS > HAS_SDL > HAS_VIDEO > HAS_VIDEO_CAPTURE > @@ -754,6 +760,7 @@ > ac_precious_vars='build_alias > host_alias > target_alias > +PKG_CONFIG > CC > CFLAGS > LDFLAGS > @@ -762,7 +769,12 @@ > CXX > CXXFLAGS > CCC > -CXXCPP' > +CXXCPP > +CPP > +OPENSSL_CFLAGS > +OPENSSL_LIBS > +SDL_CFLAGS > +SDL_LIBS' > ac_subdirs_all='plugins' > > # Initialize some variables set by options. > @@ -1400,6 +1412,7 @@ > Location of DirectX include files > > Some influential environment variables: > + PKG_CONFIG path to pkg-config utility > CC C compiler command > CFLAGS C compiler flags > LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries > in a > @@ -1410,6 +1423,13 @@ > CXX C++ compiler command > CXXFLAGS C++ compiler flags > CXXCPP C++ preprocessor > + CPP C preprocessor > + OPENSSL_CFLAGS > + C compiler flags for OPENSSL, overriding pkg-config > + OPENSSL_LIBS > + linker flags for OPENSSL, overriding pkg-config > + SDL_CFLAGS C compiler flags for SDL, overriding pkg-config > + SDL_LIBS linker flags for SDL, overriding pkg-config > > Use these variables to override the choices made by `configure' or > to help > it to find libraries and programs with nonstandard names/locations. > @@ -1834,6 +1854,11 @@ > > > > +if test \! -e ./aclocal.m4 ; then > + echo "ERROR: you must run 'aclocal' before 'autoconf'" > + exit > +fi > + > ac_aux_dir= > for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do > if test -f "$ac_dir/install-sh"; then > @@ -1868,6 +1893,126 @@ > subdirs="$subdirs plugins" > > > + > + > +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then > + if test -n "$ac_tool_prefix"; then > + # Extract the first word of "${ac_tool_prefix}pkg-config", so it > can be a program name with args. > +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 > +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 > +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } > +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then > + echo $ECHO_N "(cached) $ECHO_C" >&6 > +else > + case $PKG_CONFIG in > + [\\/]* | ?:[\\/]*) > + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the > test with a path. > + ;; > + *) > + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR > +for as_dir in $PATH > +do > + IFS=$as_save_IFS > + test -z "$as_dir" && as_dir=. > + for ac_exec_ext in '' $ac_executable_extensions; do > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x > "$as_dir/$ac_word$ac_exec_ext"; }; then > + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" > + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 > + break 2 > + fi > +done > +done > +IFS=$as_save_IFS > + > + ;; > +esac > +fi > +PKG_CONFIG=$ac_cv_path_PKG_CONFIG > +if test -n "$PKG_CONFIG"; then > + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 > +echo "${ECHO_T}$PKG_CONFIG" >&6; } > +else > + { echo "$as_me:$LINENO: result: no" >&5 > +echo "${ECHO_T}no" >&6; } > +fi > + > + > +fi > +if test -z "$ac_cv_path_PKG_CONFIG"; then > + ac_pt_PKG_CONFIG=$PKG_CONFIG > + # Extract the first word of "pkg-config", so it can be a program > name with args. > +set dummy pkg-config; ac_word=$2 > +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 > +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } > +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then > + echo $ECHO_N "(cached) $ECHO_C" >&6 > +else > + case $ac_pt_PKG_CONFIG in > + [\\/]* | ?:[\\/]*) > + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user > override the test with a path. > + ;; > + *) > + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR > +for as_dir in $PATH > +do > + IFS=$as_save_IFS > + test -z "$as_dir" && as_dir=. > + for ac_exec_ext in '' $ac_executable_extensions; do > + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x > "$as_dir/$ac_word$ac_exec_ext"; }; then > + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" > + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 > + break 2 > + fi > +done > +done > +IFS=$as_save_IFS > + > + ;; > +esac > +fi > +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG > +if test -n "$ac_pt_PKG_CONFIG"; then > + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 > +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } > +else > + { echo "$as_me:$LINENO: result: no" >&5 > +echo "${ECHO_T}no" >&6; } > +fi > + > + if test "x$ac_pt_PKG_CONFIG" = x; then > + PKG_CONFIG="" > + else > + case $cross_compiling:$ac_tool_warned in > +yes:) > +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not > detect cross-tools > +whose name does not start with the host triplet. If you think this > +configuration is useful to you, please write to aut...@gn...." > >&5 > +echo "$as_me: WARNING: In the future, Autoconf will not detect > cross-tools > +whose name does not start with the host triplet. If you think this > +configuration is useful to you, please write to aut...@gn...." > >&2;} > +ac_tool_warned=yes ;; > +esac > + PKG_CONFIG=$ac_pt_PKG_CONFIG > + fi > +else > + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" > +fi > + > +fi > +if test -n "$PKG_CONFIG"; then > + _pkg_min_version=0.9.0 > + { echo "$as_me:$LINENO: checking pkg-config is at least > version $_pkg_min_version" >&5 > +echo $ECHO_N "checking pkg-config is at least version > $_pkg_min_version... $ECHO_C" >&6; } > + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; > then > + { echo "$as_me:$LINENO: result: yes" >&5 > +echo "${ECHO_T}yes" >&6; } > + else > + { echo "$as_me:$LINENO: result: no" >&5 > +echo "${ECHO_T}no" >&6; } > + PKG_CONFIG="" > + fi > + > +fi > ac_ext=c > ac_cpp='$CPP $CPPFLAGS' > ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' > @@ -3163,10 +3308,21 @@ > > > > + > + > + > + > + > + > + > + > + > + > + > PTLIBDIR=`pwd` > -9 > > > + > if test "x$prefix" = "xNONE"; then > INSTALLPREFIX="/usr/local" > else > @@ -6925,25 +7081,10 @@ > > > > -LIBS="" > -HAS_LIBDL=no > -P_DYNALINK=0 > -if test ${OSTYPE} = beos ; then > - P_DYNALINK=1 > > -cat >>confdefs.h <<\_ACEOF > -#define P_DYNALINK 1 > -_ACEOF > > -elif test ${OSTYPE} = Darwin ; then > - P_DYNALINK=1 > + ptlib_libdl=no > > -cat >>confdefs.h <<\_ACEOF > -#define P_DYNALINK 1 > -_ACEOF > - > -else > - > for ac_header in dlfcn.h > do > as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` > @@ -7078,17 +7219,23 @@ > cat >>confdefs.h <<_ACEOF > #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 > _ACEOF > - HAS_DLFCN=yes > + ptlib_dlfcn=yes > else > - HAS_DLFCN=no > + ptlib_dlfcn=no > fi > > done > > - if test "$HAS_DLFCN" = yes ; then > - { echo "$as_me:$LINENO: checking if dlopen is available" >&5 > + if test "$ptlib_dlfcn" = yes ; then > + { echo "$as_me:$LINENO: checking if dlopen is available" > >&5 > echo $ECHO_N "checking if dlopen is available... $ECHO_C" >&6; } > - cat >conftest.$ac_ext <<_ACEOF > + ac_ext=c > +ac_cpp='$CPP $CPPFLAGS' > +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' > +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS > conftest.$ac_ext $LIBS >&5' > +ac_compiler_gnu=$ac_cv_c_compiler_gnu > + > + cat >conftest.$ac_ext <<_ACEOF > /* confdefs.h. */ > _ACEOF > cat confdefs.h >>conftest.$ac_ext > @@ -7117,31 +7264,99 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest.$ac_objext; then > - HAS_DLOPEN=yes > + ptlib_dlopen=yes > else > echo "$as_me: failed program was:" >&5 > sed 's/^/| /' conftest.$ac_ext >&5 > > - HAS_DLOPEN=no > + ptlib_dlopen=no > fi > > rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext > - if test "$HAS_DLOPEN" = no ; then > - { echo "$as_me:$LINENO: result: no" >&5 > + if test "$ptlib_dlopen" = no ; then > + { echo "$as_me:$LINENO: result: no" >&5 > echo "${ECHO_T}no" >&6; } > - else > - { echo "$as_me:$LINENO: result: yes" >&5 > + else > + { echo "$as_me:$LINENO: result: yes" >&5 > echo "${ECHO_T}yes" >&6; } > - P_DYNALINK=1 > + case "$target_os" in > + freebsd*|openbsd*|netbsd*|darwin*|beos*) > + { echo "$as_me:$LINENO: checking for dlopen in - > lc" >&5 > +echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6; } > +if test "${ac_cv_lib_c_dlopen+set}" = set; then > + echo $ECHO_N "(cached) $ECHO_C" >&6 > +else > + ac_check_lib_save_LIBS=$LIBS > +LIBS="-lc $LIBS" > +cat >conftest.$ac_ext <<_ACEOF > +/* confdefs.h. */ > +_ACEOF > +cat confdefs.h >>conftest.$ac_ext > +cat >>conftest.$ac_ext <<_ACEOF > +/* end confdefs.h. */ > > -cat >>confdefs.h <<\_ACEOF > -#define P_DYNALINK 1 > +/* 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 dlopen (); > +int > +main () > +{ > +return dlopen (); > + ; > + 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 > + ac_cv_lib_c_dlopen=yes > +else > + echo "$as_me: failed program was:" >&5 > +sed 's/^/| /' conftest.$ac_ext >&5 > > - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 > + ac_cv_lib_c_dlopen=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 > +{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_dlopen" >&5 > +echo "${ECHO_T}$ac_cv_lib_c_dlopen" >&6; } > +if test $ac_cv_lib_c_dlopen = yes; then > + > + ptlib_libdl=yes > + DL_LIBS="-lc" > + > +else > + ptlib_libdl=no > +fi > + > + ;; > + *) > + { echo "$as_me:$LINENO: checking for dlopen in - > ldl" >&5 > echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } > if test "${ac_cv_lib_dl_dlopen+set}" = set; then > echo $ECHO_N "(cached) $ECHO_C" >&6 > @@ -7184,7 +7399,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest$ac_exeext && > $as_test_x conftest$ac_exeext; then > @@ -7203,14 +7418,32 @@ > { echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 > echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } > if test $ac_cv_lib_dl_dlopen = yes; then > + > + ptlib_libdl=yes > + DL_LIBS="-ldl" > + > +else > + ptlib_libdl=no > +fi > + > + ;; > + esac > + fi > + fi > + if test $ptlib_libdl = yes; then > HAS_LIBDL=yes > else > HAS_LIBDL=no > fi > > - fi > + > +if test "x$HAS_LIBDL" = "xyes" ; then > + > +cat >>confdefs.h <<\_ACEOF > +#define P_DYNALINK 1 > +_ACEOF > + > fi > -fi > > > > @@ -7230,7 +7463,7 @@ > if test "${enable_plugins}" = "no" ; then > { echo "$as_me:$LINENO: result: no" >&5 > echo "${ECHO_T}no" >&6; } > -elif test "${P_DYNALINK:-unset}" = "unset" ; then > +elif test "x${HAS_LIBDL}" != "xyes" ; then > { echo "$as_me:$LINENO: result: plugins disabled as dlopen not > available" >&5 > echo "${ECHO_T}plugins disabled as dlopen not available" >&6; } > else > @@ -7301,7 +7534,238 @@ > { echo "$as_me:$LINENO: DNS resolver disabled" >&5 > echo "$as_me: DNS resolver disabled" >&6;} > else > + ac_ext=c > +ac_cpp='$CPP $CPPFLAGS' > +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' > +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS > conftest.$ac_ext $LIBS >&5' > +ac_compiler_gnu=$ac_cv_c_compiler_gnu > +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 > +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" > >&6; } > +# On Suns, sometimes $CPP names a directory. > +if test -n "$CPP" && test -d "$CPP"; then > + CPP= > +fi > +if test -z "$CPP"; then > + if test "${ac_cv_prog_CPP+set}" = set; then > + echo $ECHO_N "(cached) $ECHO_C" >&6 > +else > + # Double quotes because CPP needs to be expanded > + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" > + do > + ac_preproc_ok=false > +for ac_c_preproc_warn_flag in '' yes > +do > + # Use a header file that comes with gcc, so configuring glibc > + # with a fresh cross-compiler works. > + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since > + # <limits.h> exists even on freestanding compilers. > + # On the NeXT, cc -E runs the code through the compiler's parser, > + # not just through cpp. "Syntax error" is here to catch this case. > + cat >conftest.$ac_ext <<_ACEOF > +/* confdefs.h. */ > +_ACEOF > +cat confdefs.h >>conftest.$ac_ext > +cat >>conftest.$ac_ext <<_ACEOF > +/* end confdefs.h. */ > +#ifdef __STDC__ > +# include <limits.h> > +#else > +# include <assert.h> > +#endif > + Syntax error > +_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 > + : > +else > + echo "$as_me: failed program was:" >&5 > +sed 's/^/| /' conftest.$ac_ext >&5 > > + # Broken: fails on valid input. > +continue > +fi > + > +rm -f conftest.err conftest.$ac_ext > + > + # OK, works on sane cases. Now check whether nonexistent headers > + # can be detected and how. > + cat >conftest.$ac_ext <<_ACEOF > +/* confdefs.h. */ > +_ACEOF > +cat confdefs.h >>conftest.$ac_ext > +cat >>conftest.$ac_ext <<_ACEOF > +/* end confdefs.h. */ > +#include <ac_nonexistent.h> > +_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 > + # Broken: success on invalid input. > +continue > +else > + echo "$as_me: failed program was:" >&5 > +sed 's/^/| /' conftest.$ac_ext >&5 > + > + # Passes both tests. > +ac_preproc_ok=: > +break > +fi > + > +rm -f conftest.err conftest.$ac_ext > + > +done > +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was > skipped. > +rm -f conftest.err conftest.$ac_ext > +if $ac_preproc_ok; then > + break > +fi > + > + done > + ac_cv_prog_CPP=$CPP > + > +fi > + CPP=$ac_cv_prog_CPP > +else > + ac_cv_prog_CPP=$CPP > +fi > +{ echo "$as_me:$LINENO: result: $CPP" >&5 > +echo "${ECHO_T}$CPP" >&6; } > +ac_preproc_ok=false > +for ac_c_preproc_warn_flag in '' yes > +do > + # Use a header file that comes with gcc, so configuring glibc > + # with a fresh cross-compiler works. > + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since > + # <limits.h> exists even on freestanding compilers. > + # On the NeXT, cc -E runs the code through the compiler's parser, > + # not just through cpp. "Syntax error" is here to catch this case. > + cat >conftest.$ac_ext <<_ACEOF > +/* confdefs.h. */ > +_ACEOF > +cat confdefs.h >>conftest.$ac_ext > +cat >>conftest.$ac_ext <<_ACEOF > +/* end confdefs.h. */ > +#ifdef __STDC__ > +# include <limits.h> > +#else > +# include <assert.h> > +#endif > + Syntax error > +_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 > + : > +else > + echo "$as_me: failed program was:" >&5 > +sed 's/^/| /' conftest.$ac_ext >&5 > + > + # Broken: fails on valid input. > +continue > +fi > + > +rm -f conftest.err conftest.$ac_ext > + > + # OK, works on sane cases. Now check whether nonexistent headers > + # can be detected and how. > + cat >conftest.$ac_ext <<_ACEOF > +/* confdefs.h. */ > +_ACEOF > +cat confdefs.h >>conftest.$ac_ext > +cat >>conftest.$ac_ext <<_ACEOF > +/* end confdefs.h. */ > +#include <ac_nonexistent.h> > +_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 > + # Broken: success on invalid input. > +continue > +else > + echo "$as_me: failed program was:" >&5 > +sed 's/^/| /' conftest.$ac_ext >&5 > + > + # Passes both tests. > +ac_preproc_ok=: > +break > +fi > + > +rm -f conftest.err conftest.$ac_ext > + > +done > +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was > skipped. > +rm -f conftest.err conftest.$ac_ext > +if $ac_preproc_ok; then > + : > +else > + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails > sanity check > +See \`config.log' for more details." >&5 > +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check > +See \`config.log' for more details." >&2;} > + { (exit 1); exit 1; }; } > +fi > + > +ac_ext=c > +ac_cpp='$CPP $CPPFLAGS' > +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' > +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS > conftest.$ac_ext $LIBS >&5' > +ac_compiler_gnu=$ac_cv_c_compiler_gnu > + > + > + > ptlib_has_resolver=no > HAS_RES_NINIT= > > @@ -7369,7 +7833,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest$ac_exeext && > $as_test_x conftest$ac_exeext; then > @@ -7422,7 +7886,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest$ac_exeext && > $as_test_x conftest$ac_exeext; then > @@ -7510,7 +7974,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest$ac_exeext && > $as_test_x conftest$ac_exeext; then > @@ -7561,7 +8025,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest$ac_exeext && > $as_test_x conftest$ac_exeext; then > @@ -7633,7 +8097,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest$ac_exeext && > $as_test_x conftest$ac_exeext; then > @@ -7719,7 +8183,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest$ac_exeext && > $as_test_x conftest$ac_exeext; then > @@ -7796,7 +8260,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest.$ac_objext; then > ac_header_compiler=yes > @@ -7835,7 +8299,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } >/dev/null && { > - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || > + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || > test ! -s conftest.err > }; then > ac_header_preproc=yes > @@ -7851,7 +8315,7 @@ > echo "${ECHO_T}$ac_header_preproc" >&6; } > > # So? What about this header? > -case > $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in > +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag > in > yes:no: ) > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the > compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, > rejected by the preprocessor!" >&2;} > @@ -7976,7 +8440,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest$ac_exeext && > $as_test_x conftest$ac_exeext; then > @@ -8024,7 +8488,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest$ac_exeext && > $as_test_x conftest$ac_exeext; then > @@ -8071,7 +8535,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest.$ac_objext; then > HAS_INCLUDE_SASL_H=1 > @@ -8110,7 +8574,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest.$ac_objext; then > P_HAS_SASL_SASL_H=1 > @@ -8204,7 +8668,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest$ac_exeext && > $as_test_x conftest$ac_exeext; then > @@ -8294,7 +8758,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest.$ac_objext; then > ac_header_compiler=yes > @@ -8333,7 +8797,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } >/dev/null && { > - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || > + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || > test ! -s conftest.err > }; then > ac_header_preproc=yes > @@ -8349,7 +8813,7 @@ > echo "${ECHO_T}$ac_header_preproc" >&6; } > > # So? What about this header? > -case > $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in > +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag > in > yes:no: ) > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the > compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, > rejected by the preprocessor!" >&2;} > @@ -8443,7 +8907,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest$ac_exeext && > $as_test_x conftest$ac_exeext; then > @@ -8535,7 +8999,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest$ac_exeext && > $as_test_x conftest$ac_exeext; then > @@ -8585,300 +9049,106 @@ > > > > - > # Check whether --enable-openssl was given. > if test "${enable_openssl+set}" = set; then > - enableval=$enable_openssl; > + enableval=$enable_openssl; enable_openssl=$enableval > +else > + enable_openssl=$default_openssl > + > fi > > > -if test "${enable_openssl}z" = "z" ; then > - enable_openssl=$default_openssl > -fi > - > -HAS_OPENSSL= > if test "$enable_openssl" = "no" ; then > { echo "$as_me:$LINENO: OpenSSL disabled" >&5 > echo "$as_me: OpenSSL disabled" >&6;} > else > > - if test ${OPENSSLDIR:-unset} != "unset" ; then > - { echo "$as_me:$LINENO: checking for > ${OPENSSLDIR}/include/openssl/ssl.h" >&5 > -echo $ECHO_N "checking for ${OPENSSLDIR}/include/openssl/ssl.h... > $ECHO_C" >&6; } > - if test -e ${OPENSSLDIR}/include/openssl/ssl.h ; then > - { echo "$as_me:$LINENO: result: yes" >&5 > -echo "${ECHO_T}yes" >&6; } > - SSLHDR=1 > - SSLINCLUDEDIR="${OPENSSLDIR}/include" > - SSLLIBDIR="${OPENSSLDIR}/lib" > +pkg_failed=no > +{ echo "$as_me:$LINENO: checking for OPENSSL" >&5 > +echo $ECHO_N "checking for OPENSSL... $ECHO_C" >&6; } > + > +if test -n "$PKG_CONFIG"; then > + if test -n "$OPENSSL_CFLAGS"; then > + pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS" > else > - { echo "$as_me:$LINENO: result: no" >&5 > -echo "${ECHO_T}no" >&6; } > - fi > - fi > - > - > - if test "${SSLHDR:-unset}" = "unset" ; then > - > -for ac_header in openssl/ssl.h > -do > -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` > -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; > then > - { echo "$as_me:$LINENO: checking for $ac_header" >&5 > -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } > -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; > then > - echo $ECHO_N "(cached) $ECHO_C" >&6 > -fi > -ac_res=`eval echo '${'$as_ac_Header'}'` > - { echo "$as_me:$LINENO: result: $ac_res" >&5 > -echo "${ECHO_T}$ac_res" >&6; } > -else > - # Is the header compilable? > -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 > -echo $ECHO_N "checking $ac_header 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 <$ac_header> > -_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 > + if test -n "$PKG_CONFIG" && \ > + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors > \"openssl\"") >&5 > + ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 > 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_cxx_werror_flag" || > - test ! -s conftest.err > - } && test -s conftest.$ac_objext; then > - ac_header_compiler=yes > + (exit $ac_status); }; then > + pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null` > else > - echo "$as_me: failed program was:" >&5 > -sed 's/^/| /' conftest.$ac_ext >&5 > - > - ac_header_compiler=no > + pkg_failed=yes > 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 $ac_header presence" >&5 > -echo $ECHO_N "checking $ac_header 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 <$ac_header> > -_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 > + fi > +else > + pkg_failed=untried > +fi > +if test -n "$PKG_CONFIG"; then > + if test -n "$OPENSSL_LIBS"; then > + pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS" > + else > + if test -n "$PKG_CONFIG" && \ > + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors > \"openssl\"") >&5 > + ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 > 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_cxx_preproc_warn_flag$ac_cxx_werror_flag" || > - test ! -s conftest.err > - }; then > - ac_header_preproc=yes > + (exit $ac_status); }; then > + pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null` > else > - echo "$as_me: failed program was:" >&5 > -sed 's/^/| /' conftest.$ac_ext >&5 > - > - ac_header_preproc=no > + pkg_failed=yes > 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_cxx_preproc_warn_flag in > - yes:no: ) > - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the > compiler, rejected by the preprocessor!" >&5 > -echo "$as_me: WARNING: $ac_header: accepted by the compiler, > rejected by the preprocessor!" >&2;} > - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the > compiler's result" >&5 > -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's > result" >&2;} > - ac_header_preproc=yes > - ;; > - no:yes:* ) > - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot > be compiled" >&5 > -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" > >&2;} > - { echo "$as_me:$LINENO: WARNING: $ac_header: check for > missing prerequisite headers?" >&5 > -echo "$as_me: WARNING: $ac_header: check for missing > prerequisite headers?" >&2;} > - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf > documentation" >&5 > -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" > >&2;} > - { echo "$as_me:$LINENO: WARNING: $ac_header: section > \"Present But Cannot Be Compiled\"" >&5 > -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot > Be Compiled\"" >&2;} > - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the > preprocessor's result" >&5 > -echo "$as_me: WARNING: $ac_header: proceeding with the > preprocessor's result" >&2;} > - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the > compiler will take precedence" >&5 > -echo "$as_me: WARNING: $ac_header: in the future, the compiler will > take precedence" >&2;} > - > - ;; > -esac > -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 > -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } > -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; > then > - echo $ECHO_N "(cached) $ECHO_C" >&6 > + fi > else > - eval "$as_ac_Header=\$ac_header_preproc" > + pkg_failed=untried > fi > -ac_res=`eval echo '${'$as_ac_Header'}'` > - { echo "$as_me:$LINENO: result: $ac_res" >&5 > -echo "${ECHO_T}$ac_res" >&6; } > > -fi > -if test `eval echo '${'$as_ac_Header'}'` = yes; then > - cat >>confdefs.h <<_ACEOF > -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 > -_ACEOF > - SSLHDR=1 > -fi > > -done > > - if test "${SSLHDR:-unset}" = "unset" ; then > - { echo "$as_me:$LINENO: checking if openssl/ssl.h works with > OPENSSL_NO_KRB5" >&5 > -echo $ECHO_N "checking if openssl/ssl.h works with > OPENSSL_NO_KRB5... $ECHO_C" >&6; } > - cat >conftest.$ac_ext <<_ACEOF > -#define OPENSSL_NO_KRB5 > -#include <openssl/ssl.h> > -int main(int argc,char **argv){} > -_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_cxx_werror_flag" || > - test ! -s conftest.err > - } && test -s conftest.$ac_objext; then > - SSLHDR=1 > +if test $pkg_failed = yes; then > + > +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then > + _pkg_short_errors_supported=yes > else > - echo "$as_me: failed program was:" >&5 > -sed 's/^/| /' conftest.$ac_ext >&5 > - > - > + _pkg_short_errors_supported=no > fi > - > -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext > - if test "${SSLHDR:-unset}" != "unset" ; then > - { echo "$as_me:$LINENO: result: yes" >&5 > -echo "${ECHO_T}yes" >&6; } > - SSLCCFLAGS=" -DOPENSSL_NO_KRB5" > - P_STATIC_LDFLAGS="$P_STATIC_LDFLAGS -L/usr/kerberos/lib" > - if test ${OSTYPE} = linux ; then > - P_STATIC_ENDLDLIBS="-lkrb5 -lk5crypto -lcom_err" > + if test $_pkg_short_errors_supported = yes; then > + OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors -- > errors-to-stdout --print-errors "openssl"` > + else > + OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout -- > print-errors "openssl"` > fi > - else > - { echo "$as_me:$LINENO: result: no" >&5 > -echo "${ECHO_T}no" >&6; } > - fi > - fi > - fi > + # Put the nasty error message in config.log where it belongs > + echo "$OPENSSL_PKG_ERRORS" >&5 > > - if test "${SSLHDR:-unset}" = "unset" ; then > - > - for openssl_dir in /usr/local/openssl /usr/local/ssl ; do > - { echo "$as_me:$LINENO: checking for OpenSSL in $openssl_dir" > >&5 > -echo $ECHO_N "checking for OpenSSL in $openssl_dir... $ECHO_C" >&6; > } > - if test ! -f ${openssl_dir}/include/openssl/ssl.h ; then > - { echo "$as_me:$LINENO: result: no" >&5 > + { echo "$as_me:$LINENO: result: no" >&5 > echo "${ECHO_T}no" >&6; } > - else > - cat >conftest.$ac_ext <<_ACEOF > -#include "${openssl_dir}/include/openssl/ssl.h" > -int main(int argc,char **argv){ return 0; } > -_ACEOF > - $CXX $CXXFLAGS -I${openssl_dir}/include -c conftest.$ac_ext > > /dev/null 2>&1 > - if test $? = 0 ; then > - { echo "$as_me:$LINENO: result: yes" >&5 > + HAS_OPENSSL= > +elif test $pkg_failed = untried; then > + HAS_OPENSSL= > +else > + OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS > + OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS > + { echo "$as_me:$LINENO: result: yes" >&5 > echo "${ECHO_T}yes" >&6; } > - SSLHDR=1 > - SSLCCFLAGS="" > - SSLINCLUDEDIR="${openssl_dir}/include" > - SSLLIBDIR="${openssl_dir}/lib" > - break > - else > - { echo "$as_me:$LINENO: result: no" >&5 > -echo "${ECHO_T}no" >&6; } > - { echo "$as_me:$LINENO: checking if > ${openssl_dir}/include/openssl/ssl.h works with OPENSSL_NO_KRB5..." > >&5 > -echo $ECHO_N "checking if ${openssl_dir}/include/openssl/ssl.h works > with OPENSSL_NO_KRB5...... $ECHO_C" >&6; } > - cat >conftest.$ac_ext <<_ACEOF > -#define OPENSSL_NO_KRB5 > -#include "${openssl_dir}/include/openssl/ssl.h" > -int main(int argc,char **argv){} > -_ACEOF > - $CXX $CXXFLAGS -I${openssl_dir}/openssl/include -c > conftest.$ac_ext > /dev/null 2>&1 > - if test $? = 0 ; then > - { echo "$as_me:$LINENO: result: yes" >&5 > -echo "${ECHO_T}yes" >&6; } > - SSLHDR=1 > - SSLCCFLAGS=" -DOPENSSL_NO_KRB5" > - SSLINCLUDEDIR="${openssl_dir}/include" > - SSLLIBDIR="${openssl_dir}/lib" > - P_STATIC_LDFLAGS="$P_STATIC_LDFLAGS -L/usr/kerberos/lib" > - if test ${OSTYPE} = linux ; then > - P_STATIC_ENDLDLIBS="-lkrb5 -lk5crypto - > lcom_err" > - fi > - break > - else > - { echo "$as_me:$LINENO: result: no" >&5 > -echo "${ECHO_T}no" >&6; } > - fi > - fi > - fi > - done > - fi > > - if test ${SSLHDR:-unset} != "unset" ; then > + HAS_OPENSSL=1 > > cat >>confdefs.h <<\_ACEOF > #define P_OSSL 1 > _ACEOF > > - HAS_OPENSSL=1 > - if test ${SSLINCLUDEDIR:-unset} != "unset" ; then > - STDCCFLAGS="$STDCCFLAGS -I${SSLINCLUDEDIR}" > - fi > - if test ${SSLLIBDIR:-unset} != "unset" ; then > - LDFLAGS="$LDFLAGS -L${SSLLIBDIR}" > - fi > - STDCCFLAGS="${STDCCFLAGS}${SSLCCFLAGS}" > - ENDLDLIBS="$ENDLDLIBS -lssl -lcrypto" > > + ptlib_openssl_aes=no > + old_CFLAGS="$CFLAGS" > + CFLAGS="$CFLAGS $OPENSSL_CFLAGS" > + ac_ext=c > +ac_cpp='$CPP $CPPFLAGS' > +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' > +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS > conftest.$ac_ext $LIBS >&5' > +ac_compiler_gnu=$ac_cv_c_compiler_gnu > > + > for ac_header in openssl/aes.h > do > as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` > @@ -8918,7 +9188,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest.$ac_objext; then > ac_header_compiler=yes > @@ -8957,7 +9227,7 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } >/dev/null && { > - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || > + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || > test ! -s conftest.err > }; then > ac_header_preproc=yes > @@ -8973,7 +9243,7 @@ > echo "${ECHO_T}$ac_header_preproc" >&6; } > > # So? What about this header? > -case > $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in > +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag > in > yes:no: ) > { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the > compiler, rejected by the preprocessor!" >&5 > echo "$as_me: WARNING: $ac_header: accepted by the compiler, > rejected by the preprocessor!" >&2;} > @@ -9013,24 +9283,40 @@ > cat >>confdefs.h <<_ACEOF > #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 > _ACEOF > - HAS_SSL_AES=yes > -else > - HAS_SSL_AES=no > + ptlib_openssl_aes=yes > fi > > done > > - if test "$HAS_SSL_AES" = yes ; then > + ac_ext=cpp > +ac_cpp='$CXXCPP $CPPFLAGS' > +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' > +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS > conftest.$ac_ext $LIBS >&5' > +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu > > + CFLAGS="${old_CFLAGS}" > + if test $ptlib_openssl_aes = yes; then > + > cat >>confdefs.h <<\_ACEOF > #define P_OSSL_AES 1 > _ACEOF > > - fi > +fi > > - { echo "$as_me:$LINENO: checking for const arg to > d2i_AutoPrivateKey" >&5 > + > + > + ptlib_openssl_const=no > + old_CFLAGS="$CFLAGS" > + CFLAGS="$CFLAGS $OPENSSL_CFLAGS" > + ac_ext=c > +ac_cpp='$CPP $CPPFLAGS' > +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' > +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS > conftest.$ac_ext $LIBS >&5' > +ac_compiler_gnu=$ac_cv_c_compiler_gnu > + > + { echo "$as_me:$LINENO: checking for const arg to > d2i_AutoPrivateKey" >&5 > echo $ECHO_N "checking for const arg to d2i_AutoPrivateKey... > $ECHO_C" >&6; } > - cat >conftest.$ac_ext <<_ACEOF > + cat >conftest.$ac_ext <<_ACEOF > /* confdefs.h. */ > _ACEOF > cat confdefs.h >>conftest.$ac_ext > @@ -9040,9 +9326,10 @@ > int > main () > { > - EVP_PKEY **a; const unsigned char **p; long l; > - d2i_AutoPrivateKey(a, p, l); > > + EVP_PKEY **a; const unsigned char **p; > long l; > + d2i_AutoPrivateKey(a, p, l); > + > ; > return 0; > } > @@ -9061,10 +9348,11 @@ > cat conftest.err >&5 > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > (exit $ac_status); } && { > - test -z "$ac_cxx_werror_flag" || > + test -z "$ac_c_werror_flag" || > test ! -s conftest.err > } && test -s conftest.$ac_objext; then > - P_SSL_USE_CONST=yes > + ptlib_openssl_const=yes > + > else > echo "$as_me: failed program was:" >&5 > sed 's/^/| /' conftest.$ac_ext >&5 > @@ -9073,28 +9361,39 @@ > fi > > rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext > - if test "${P_SSL_USE_CONST}x" = "x" ; then > - { echo "$as_me:$LINENO: result: no" >&5 > -echo "${ECHO_T}no" >&6; } > - else > - { echo "$as_me:$LINENO: result: yes" >&5 > -echo "${ECHO_T}yes" >&6; } > + { echo "$as_me:$LINENO: result: ${ptlib_openssl_const}" > >&5 > +echo "${ECHO_T}${ptlib_openssl_const}" >&6; } > + ac_ext=cpp > +ac_cpp='$CXXCPP $CPPFLAGS' > +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' > +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS > conftest.$ac_ext $LIBS >&5' > +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu > > + CFLAGS="${old_CFLAGS}" > + > + if test $ptlib_openssl_const = yes; then > + > cat >>confdefs.h <<\_ACEOF > #define P_SSL_USE_CONST 1 > _ACEOF > > - fi > - fi > fi > > > + STDCCFLAGS="$STDCCFLAGS ${OPENSSL_CFLAGS}" > + ENDLDLIBS="$ENDLDLIBS ${OPENSSL_LIBS}" > > +fi > +fi > > > > > > + > + > + > + > # Check whether --enable-configfile was given. > if test "${enable_configfile+set}" = set; then > enableval=$enable_configfile; > @@ -10125,397 +10424,146 @@ > > # Check whether --enable-sdl was given. > if test "${enable_sdl+set}" = set; then > - enableval=$enable_sdl; > + enableval=$enable_sdl; enable_sdl=$enableval > +else > + enable_sdl=$default_sdl > + > fi > > > -if test "${enable_sdl}z" = "z" ; then > - enable_sdl=$default_sdl > -fi > - > HAS_SDL= > if test "$enable_sdl" = "no" ; then > { echo "$as_me:$LINENO: SDL disabled" >&5 > echo "$as_me: SDL disabled" >&6;} > - cat >>confdefs.h <<\_ACEOF > -#define P_SDL 0 > -_ACEOF > - > else > - if test "${SDLLIB:-unset}" = "unset" ; then > - SDLLIB=SDL > - fi > > > -for ac_header in SDL/SDL.h > -do > -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` > -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; > then > - { echo "$as_me:$LINENO: checking for $ac_header" >&5 > -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } > -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; > then > - echo $ECHO_N "(cached) $ECHO_C" >&6 > -fi > -ac_res=`eval echo '${'$as_ac_Header'}'` > - { echo "$as_me:$LINENO: result: $ac_res" >&5 > -echo "${ECHO_T}$ac_res" >&6; } > -else > - # Is the header compilable? > -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 > -echo $ECHO_N "checking $ac_header 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 <$ac_header> > -_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 > +pkg_failed=no > +{ echo "$as_me:$LINENO: checking for SDL" >&5 > +echo $ECHO_N "checking for SDL... $ECHO_C" >&6; } > + > +if test -n "$PKG_CONFIG"; then > + if test -n "$SDL_CFLAGS"; then > + pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" > + else > + if test -n "$PKG_CONFIG" && \ > + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors > \"sdl\"") >&5 > + ($PKG_CONFIG --exists --print-errors "sdl") 2>&5 > 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_cxx_werror_flag" || > - test ! -s conftest.err > - } && test -s conftest.$ac_objext; then > - ac_header_compiler=yes > + (exit $ac_status); }; then > + pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl" 2>/dev/null` > else > - echo "$as_me: failed program was:" >&5 > -sed 's/^/| /' conftest.$ac_ext >&5 > - > - ac_header_compiler=no > + pkg_failed=yes > 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 $ac_header presence" >&5 > -echo $ECHO_N "checking $ac_header 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 <$ac_header> > -_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 > + fi > +else > + pkg_failed=untried > +fi > +if test -n "$PKG_CONFIG"; then > + if test -n "$SDL_LIBS"; then > + pkg_cv_SDL_LIBS="$SDL_LIBS" > + else > + if test -n "$PKG_CONFIG" && \ > + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors > \"sdl\"") >&5 > + ($PKG_CONFIG --exists --print-errors "sdl") 2>&5 > 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_cxx_preproc_warn_flag$ac_cxx_werror_flag" || > - test ! -s conftest.err > - }; then > - ac_header_preproc=yes > + (exit $ac_status); }; then > + pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl" 2>/dev/null` > else > - echo "$as_me: failed program was:" >&5 > -sed 's/^/| /' conftest.$ac_ext >&5 > - > - ac_header_preproc=no > + pkg_failed=yes > 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_cxx_preproc_warn_flag in > - yes:no: ) > - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the > compiler, rejected by the preprocessor!" >&5 > -echo "$as_me: WARNING: $ac_header: accepted by the compiler, > rejected by the preprocessor!" >&2;} > - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the > compiler's result" >&5 > -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's > result" >&2;} > - ac_header_preproc=yes > - ;; > - no:yes:* ) > - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot > be compiled" >&5 > -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" > >&2;} > - { echo "$as_me:$LINENO: WARNING: $ac_header: check for > missing prerequisite headers?" >&5 > -echo "$as_me: WARNING: $ac_header: check for missing > prerequisite headers?" >&2;} > - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf > documentation" >&5 > -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" > >&2;} > - { echo "$as_me:$LINENO: WARNING: $ac_header: section > \"Present But Cannot Be Compiled\"" >&5 > -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot > Be Compiled\"" >&2;} > - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the > preprocessor's result" >&5 > -echo "$as_me: WARNING: $ac_header: proceeding with the > preprocessor's result" >&2;} > - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the > compiler will take precedence" >&5 > -echo "$as_me: WARNING: $ac_header: in the future, the compiler will > take precedence" >&2;} > - > - ;; > -esac > -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 > -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } > -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; > then > - echo $ECHO_N "(cached) $ECHO_C" >&6 > + fi > else > - eval "$as_ac_Header=\$ac_header_preproc" > + pkg_failed=untried > fi > -ac_res=`eval echo '${'$as_ac_Header'}'` > - { echo "$as_me:$LINENO: result: $ac_res" >&5 > -echo "${ECHO_T}$ac_res" >&6; } > > -fi > -if test `eval echo '${'$as_ac_Header'}'` = yes; then > - cat >>confdefs.h <<_ACEOF > -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 > -_ACEOF > - HAS_SDL=1 > -fi > > -done > > - if test "${HAS_SDL:-unset}" != "unset" ; then > - if test "${X11LIBDIR:-unset}" == "unset" ; then > - X11LIBDIR=/usr/X11R6/lib > - fi > - { echo "$as_me:$LINENO: checking for SDL_CreateYUVOverlay in - > lSDL" >&5 > -echo $ECHO_N "checking for SDL_CreateYUVOverlay in -lSDL... $ECHO_C" > >&6; } > -if test "${ac_cv_lib_SDL_SDL_CreateYUVOverlay+set}" = set; then > - echo $ECHO_N "(cached) $ECHO_C" >&6 > -else > - ac_check_lib_save_LIBS=$LIBS > -LIBS="-lSDL -L${X11LIBDIR} -lpthread -lX11 -lXext $LIBS" > -cat >conftest.$ac_ext <<_ACEOF > -/* confdefs.h. */ > -_ACEOF > -cat confdefs.h >>conftest.$ac_ext > -cat >>conftest.$ac_ext <<_ACEOF > -/* end confdefs.h. */ > +if test $pkg_failed = yes; then > > -/* 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 SDL_CreateYUVOverlay (); > -int > -main () > -{ > -return SDL_CreateYUVOverlay (); > - ; > - 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_cxx_werror_flag" || > - test ! -s conftest.err > - } && test -s conftest$ac_exeext && > - $as_test_x conftest$ac_exeext; then > - ac_cv_lib_SDL_SDL_CreateYUVOverlay=yes > +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then > + _pkg_short_errors_supported=yes > else > - echo "$as_me: failed program was:" >&5 > -sed 's/^/| /' conftest.$ac_ext >&5 > - > - ac_cv_lib_SDL_SDL_CreateYUVOverlay=no > + _pkg_short_errors_supported=no > fi > + if test $_pkg_short_errors_supported = yes; then > + SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors- > to-stdout --print-errors "sdl"` > + else > + SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout -- > print-errors "sdl"` > + fi > + # Put the nasty error message in config.log where it belongs > + echo "$SDL_PKG_ERRORS" >&5 > > -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 > -{ echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_CreateYUVOverlay" > >&5 > -echo "${ECHO_T}$ac_cv_lib_SDL_SDL_CreateYUVOverlay" >&6; } > -if test $ac_cv_lib_SDL_SDL_CreateYUVOverlay = yes; then > - HAS_SDL=1 > -else > - HAS_SDL= > -fi > + { { echo "$as_me:$LINENO: error: Package requirements (sdl) > were not met: > > - fi > +$SDL_PKG_ERRORS > > - if test "${HAS_SDL:-unset}" = "unset" ; then > - if test "${ac_cv_header_SDL11_SDL_h+set}" = set; then > - { echo "$as_me:$LINENO: checking for SDL11/SDL.h" >&5 > -echo $ECHO_N "checking for SDL11/SDL.h... $ECHO_C" >&6; } > -if test "${ac_cv_header_SDL11_SDL_h+set}" = set; then > - echo $ECHO_N "(cached) $ECHO_C" >&6 > -fi > -{ echo "$as_me:$LINENO: result: $ac_cv_header_SDL11_SDL_h" >&5 > -echo "${ECHO_T}$ac_cv_header_SDL11_SDL_h" >&6; } > -else > - # Is the header compilable? > -{ echo "$as_me:$LINENO: checking SDL11/SDL.h usability" >&5 > -echo $ECHO_N "checking SDL11/SDL.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 <SDL11/SDL.h> > -_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_cxx_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 > +Consider adjusting the PKG_CONFIG_PATH environment variable if you > +installed software in a non-standard prefix. > > - ac_header_compiler=no > -fi > +Alternatively, you may set the environment variables SDL_CFLAGS > +and SDL_LIBS to avoid the need to call pkg-config. > +See the pkg-config man page for more details. > +" >&5 > +echo "$as_me: error: Package requirements (sdl) were not met: > > -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; } > +$SDL_PKG_ERRORS > > -# Is the header present? > -{ echo "$as_me:$LINENO: checking SDL11/SDL.h presence" >&5 > -echo $ECHO_N "checking SDL11/SDL.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 <SDL11/SDL.h> > -_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_cxx_preproc_warn_flag$ac_cxx_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 > +Consider adjusting the PKG_CONFIG_PATH environment variable if you > +installed software in a non-standard prefix. > > - ac_header_preproc=no > -fi > +Alternatively, you may set the environment variables SDL_CFLAGS > +and SDL_LIBS to avoid the need to call pkg-config. > +See the pkg-config man page for more details. > +" >&2;} > + { (exit 1); exit 1; }; } > +elif test $pkg_failed = untried; then > + { { echo "$as_me:$LINENO: error: The pkg-config script could > not be found or is too old. Make sure it > +is in your PATH or set the PKG_CONFIG environment variable to the > full > +path to pkg-config. > > -rm -f conftest.err conftest.$ac_ext > -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 > -echo "${ECHO_T}$ac_header_preproc" >&6; } > +Alternatively, you may set the environment variables SDL_CFLAGS > +and SDL_LIBS to avoid the need to call pkg-config. > +See the pkg-config man page for more details. > > -# So? What about this header? > -case > $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in > - yes:no: ) > - { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: accepted by the > compiler, rejected by t... [truncated message content] |
|
From: <rjo...@us...> - 2008-08-19 01:45:43
|
Revision: 20688
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20688&view=rev
Author: rjongbloed
Date: 2008-08-19 01:45:53 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
Removed test aclocal.m4 file in configure so can do the configure
without needing to run aclocal and autoconf first.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-18 17:33:18 UTC (rev 20687)
+++ ptlib/trunk/configure 2008-08-19 01:45:53 UTC (rev 20688)
@@ -1854,11 +1854,6 @@
-if test \! -e ./aclocal.m4 ; then
- echo "ERROR: you must run 'aclocal' before 'autoconf'"
- exit
-fi
-
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -9067,11 +9062,10 @@
{ echo "$as_me:$LINENO: checking for OPENSSL" >&5
echo $ECHO_N "checking for OPENSSL... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$OPENSSL_CFLAGS"; then
- pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$OPENSSL_CFLAGS"; then
+ pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
($PKG_CONFIG --exists --print-errors "openssl") 2>&5
ac_status=$?
@@ -9081,15 +9075,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$OPENSSL_LIBS"; then
- pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$OPENSSL_LIBS"; then
+ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
($PKG_CONFIG --exists --print-errors "openssl") 2>&5
ac_status=$?
@@ -9099,9 +9091,8 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -9114,9 +9105,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl" 2>&1`
else
- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$OPENSSL_PKG_ERRORS" >&5
@@ -10442,11 +10433,10 @@
{ echo "$as_me:$LINENO: checking for SDL" >&5
echo $ECHO_N "checking for SDL... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$SDL_CFLAGS"; then
- pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$SDL_CFLAGS"; then
+ pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5
($PKG_CONFIG --exists --print-errors "sdl") 2>&5
ac_status=$?
@@ -10456,15 +10446,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$SDL_LIBS"; then
- pkg_cv_SDL_LIBS="$SDL_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$SDL_LIBS"; then
+ pkg_cv_SDL_LIBS="$SDL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5
($PKG_CONFIG --exists --print-errors "sdl") 2>&5
ac_status=$?
@@ -10474,9 +10462,8 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10489,9 +10476,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl"`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl" 2>&1`
else
- SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl"`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$SDL_PKG_ERRORS" >&5
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-18 17:33:18 UTC (rev 20687)
+++ ptlib/trunk/configure.ac 2008-08-19 01:45:53 UTC (rev 20688)
@@ -1,10 +1,5 @@
AC_INIT(include/ptlib.h)
-if test \! -e ./aclocal.m4 ; then
- echo "ERROR: you must run 'aclocal' before 'autoconf'"
- exit
-fi
-
AC_CONFIG_SUBDIRS(plugins)
dnl PKG_LIBS=
@@ -1480,7 +1475,7 @@
PTLIB_OPENSSL_CONST( [AC_DEFINE([P_SSL_USE_CONST], [1], [SSL with const])] )
STDCCFLAGS="$STDCCFLAGS ${OPENSSL_CFLAGS}"
ENDLDLIBS="$ENDLDLIBS ${OPENSSL_LIBS}"
-dnl PKG_REQUIRES="$PKG_REQUIRES sdl"
+dnl PKG_REQUIRES="$PKG_REQUIRES ssl"
],
[HAS_OPENSSL=])
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2008-08-19 02:15:42
|
Revision: 20691
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20691&view=rev
Author: rjongbloed
Date: 2008-08-19 02:15:53 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
Ignorance
Property Changed:
----------------
ptlib/trunk/
ptlib/trunk/plugins/vidinput_v4l2/
Property changes on: ptlib/trunk
___________________________________________________________________
Modified: svn:ignore
- Lib
Debug
Release
*.suo
*.ncb
*.opt
*.plg
*.Tags.WW
config.log
config.status
a.out
Makefile
html
bin
lib
ptlib_cfg.dxy
ptlib.pc
+ Lib
Debug
Release
*.suo
*.ncb
*.opt
*.plg
*.Tags.WW
config.log
config.status
a.out
Makefile
html
bin
lib
ptlib_cfg.dxy
ptlib.pc
autom4te.cache
Property changes on: ptlib/trunk/plugins/vidinput_v4l2
___________________________________________________________________
Added: svn:ignore
+ Makefile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dsa...@us...> - 2008-08-19 13:48:08
|
Revision: 20700
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20700&view=rev
Author: dsandras
Date: 2008-08-19 13:48:18 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
Made SDL optionnal.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-19 09:25:19 UTC (rev 20699)
+++ ptlib/trunk/configure 2008-08-19 13:48:18 UTC (rev 20700)
@@ -5757,7 +5757,7 @@
default_openldap=yes
default_openssl=yes
default_expat=yes
-default_sdl=yes
+default_sdl=no
default_sasl=yes
default_plugins=yes
default_tts=yes
@@ -9062,10 +9062,11 @@
{ echo "$as_me:$LINENO: checking for OPENSSL" >&5
echo $ECHO_N "checking for OPENSSL... $ECHO_C" >&6; }
-if test -n "$OPENSSL_CFLAGS"; then
- pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$OPENSSL_CFLAGS"; then
+ pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
($PKG_CONFIG --exists --print-errors "openssl") 2>&5
ac_status=$?
@@ -9075,13 +9076,15 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
-if test -n "$OPENSSL_LIBS"; then
- pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$OPENSSL_LIBS"; then
+ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
($PKG_CONFIG --exists --print-errors "openssl") 2>&5
ac_status=$?
@@ -9091,8 +9094,9 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -9105,9 +9109,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl" 2>&1`
+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
else
- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl" 2>&1`
+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
fi
# Put the nasty error message in config.log where it belongs
echo "$OPENSSL_PKG_ERRORS" >&5
@@ -10433,10 +10437,11 @@
{ echo "$as_me:$LINENO: checking for SDL" >&5
echo $ECHO_N "checking for SDL... $ECHO_C" >&6; }
-if test -n "$SDL_CFLAGS"; then
- pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$SDL_CFLAGS"; then
+ pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5
($PKG_CONFIG --exists --print-errors "sdl") 2>&5
ac_status=$?
@@ -10446,13 +10451,15 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
-if test -n "$SDL_LIBS"; then
- pkg_cv_SDL_LIBS="$SDL_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$SDL_LIBS"; then
+ pkg_cv_SDL_LIBS="$SDL_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5
($PKG_CONFIG --exists --print-errors "sdl") 2>&5
ac_status=$?
@@ -10462,8 +10469,9 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -10476,9 +10484,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl" 2>&1`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl"`
else
- SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl" 2>&1`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl"`
fi
# Put the nasty error message in config.log where it belongs
echo "$SDL_PKG_ERRORS" >&5
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-19 09:25:19 UTC (rev 20699)
+++ ptlib/trunk/configure.ac 2008-08-19 13:48:18 UTC (rev 20700)
@@ -758,7 +758,7 @@
default_openldap=yes
default_openssl=yes
default_expat=yes
-default_sdl=yes
+default_sdl=no
default_sasl=yes
default_plugins=yes
default_tts=yes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ms3...@us...> - 2008-08-19 17:15:12
|
Revision: 20701
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20701&view=rev
Author: ms30002000
Date: 2008-08-19 17:15:19 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
Really fix compilation when SDL is not found...
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-19 13:48:18 UTC (rev 20700)
+++ ptlib/trunk/configure 2008-08-19 17:15:19 UTC (rev 20701)
@@ -5757,7 +5757,7 @@
default_openldap=yes
default_openssl=yes
default_expat=yes
-default_sdl=no
+default_sdl=yes
default_sasl=yes
default_plugins=yes
default_tts=yes
@@ -10491,51 +10491,11 @@
# Put the nasty error message in config.log where it belongs
echo "$SDL_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (sdl) were not met:
-
-$SDL_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables SDL_CFLAGS
-and SDL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-echo "$as_me: error: Package requirements (sdl) were not met:
-
-$SDL_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables SDL_CFLAGS
-and SDL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ HAS_SDL=
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables SDL_CFLAGS
-and SDL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables SDL_CFLAGS
-and SDL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ HAS_SDL=
else
SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
SDL_LIBS=$pkg_cv_SDL_LIBS
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-19 13:48:18 UTC (rev 20700)
+++ ptlib/trunk/configure.ac 2008-08-19 17:15:19 UTC (rev 20701)
@@ -758,7 +758,7 @@
default_openldap=yes
default_openssl=yes
default_expat=yes
-default_sdl=no
+default_sdl=yes
default_sasl=yes
default_plugins=yes
default_tts=yes
@@ -1475,7 +1475,7 @@
PTLIB_OPENSSL_CONST( [AC_DEFINE([P_SSL_USE_CONST], [1], [SSL with const])] )
STDCCFLAGS="$STDCCFLAGS ${OPENSSL_CFLAGS}"
ENDLDLIBS="$ENDLDLIBS ${OPENSSL_LIBS}"
-dnl PKG_REQUIRES="$PKG_REQUIRES ssl"
+dnl PKG_REQUIRES="$PKG_REQUIRES openssl"
],
[HAS_OPENSSL=])
fi
@@ -1925,7 +1925,7 @@
STDCCFLAGS="$STDCCFLAGS ${SDL_CFLAGS}"
ENDLDLIBS="$ENDLDLIBS ${SDL_LIBS}"
dnl PKG_REQUIRES="$PKG_REQUIRES sdl"
- ])
+ ], [HAS_SDL=])
dnl to verify:
dnl AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ms3...@us...> - 2008-08-20 17:38:24
|
Revision: 20705
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20705&view=rev
Author: ms30002000
Date: 2008-08-20 17:38:32 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
Next wave of changes in PTLIB build system. Make use of
PTLIB_SIMPLE_OPTION for options that will be enabled/
disabled from command line only.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
ptlib/trunk/include/ptbuildopts.h.in
ptlib/trunk/include/ptlib/plugin.h
ptlib/trunk/src/ptlib/common/pglobalstatic.cxx
ptlib/trunk/src/ptlib/unix/remconn.cxx
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-20 07:06:23 UTC (rev 20704)
+++ ptlib/trunk/configure 2008-08-20 17:38:32 UTC (rev 20705)
@@ -709,24 +709,21 @@
HAS_OPENSSL
P_STATIC_ENDLDLIBS
P_STATIC_LDFLAGS
+HAS_EXPAT
+HAS_IPV6
+SDL_CFLAGS
+SDL_LIBS
+HAS_SDL
HAS_CONFIG_FILE
HAS_URL
HAS_HTTP
HAS_HTTPFORMS
HAS_HTTPSVC
-HAS_EXPAT
+HAS_JABBER
HAS_VXML
-HAS_JABBER
HAS_XMLRPC
HAS_SOAP
HAS_TTS
-HAS_IPV6
-SDL_CFLAGS
-SDL_LIBS
-HAS_SDL
-HAS_VIDEO
-HAS_VIDEO_CAPTURE
-USE_SHM_VIDEO_DEVICES
HAS_ASN
HAS_STUN
HAS_PIPECHAN
@@ -740,9 +737,12 @@
HAS_SERIAL
HAS_POP3SMTP
HAS_SOCKAGG
+HAS_AUDIO
+HAS_VIDEO
HAS_VIDFILE
HAS_APPSHARE
-HAS_AUDIO
+HAS_VIDEO_CAPTURE
+USE_SHM_VIDEO_DEVICES
HAS_OSS
HAS_ALSA
HAS_ODBC
@@ -1362,43 +1362,43 @@
--disable-sasl disable SASL support
--disable-openldap disable OpenLDAP support
--disable-openssl disable OpenSSL support
- --disable-configfile disable config file support
- --disable-url disable URL support
- --disable-http disable HTTP support
- --disable-httpforms disable HTTP forms support
- --disable-httpsvc disable HTTP service support
--disable-expat disable XML support
- --disable-jabber disable Jabber support
- --disable-vxml disable VXML support
- --disable-xmlrpc disable XMLRPC support
- --disable-soap disable SOAP support
- --disable-tts disable Text-ToSpeech support (default enabled)
--disable-ipv6 disable IPV6 support
+ --disable-sdl disable SDL support
+ --enable-configfile enable config file support
+ --enable-url enable URL support
+ --enable-http enable HTTP support
+ --enable-httpforms enable HTTP forms support
+ --enable-httpsvc enable HTTP server support
+ --enable-jabber enable Jabber support
+ --enable-vxml enable VXML support
+ --enable-xmlrpc enable XMLRPC support
+ --enable-soap enable SOAP support
+ --enable-tts enable Text-To-Speech server support
+ --enable-asn enable ASN decoding/encoding support
+ --enable-stun enable STUN support
+ --enable-pipechan enable pipechannel support
+ --enable-dtmf enable DTMF protocol support
+ --enable-wavfile enable WAVFILE support
+ --enable-socks enable SOCKS protocol support
+ --enable-ftp enable FTP protocol support
+ --enable-snmp enable SNMP protocol support
+ --enable-telnet enable TELNET protocol support
+ --enable-remconn enable remote connection support
+ --enable-serial enable serial port support
+ --enable-pop3smtp enable POP3/SMTP support
+ --enable-sockagg enable socket aggregation
+ --enable-audio enable audio support
--disable-qos disable QOS support
- --disable-sdl disable SDL support
- --disable-video disable video device support
+ --enable-video enable video device support
+ --enable-vidfile enable video file support
+ --enable-appshare enable application sharing support
--enable-v4l enable V4L video support
--enable-v4l2 enable V4L2 video support
--enable-bsdvideo enable BSD video support
--enable-avc enable IEEE1394/AVC video support
--enable-dc enable IEEE1394/DC video support
--enable-shmvideo enable shared memory video devices
- --disable-asn disable ASN decoding/encoding support
- --disable-stun disable STUN protocol support
- --disable-pipechan disable pipechannel support
- --disable-dtmf disable DTMF protocol support
- --disable-wavfile disable WAVFILE support
- --disable-socks disable SOCKS protocol support
- --disable-ftp disable FTP support
- --disable-snmp disable SNMP protocol support
- --disable-telnet disable Telnet protocol support
- --disable-remconn disable remote connection support
- --disable-serial disable serial port support
- --disable-pop3smtp disable POP3/SMTP support
- --disable-sockagg disable socket aggregation
- --enable-vidfile enable video file support
- --enable-appshare enable Application share support
- --disable-audio disable audio support
--enable-alsa enable ALSA audio support
--enable-oss enable OSS audio support
--enable-memcheck enable leak testing code (off by default)
@@ -5751,7 +5751,7 @@
fi
-default_samples=no
+HAS_SAMPLES=no
default_tracing=yes
default_resolver=yes
default_openldap=yes
@@ -5759,38 +5759,39 @@
default_expat=yes
default_sdl=yes
default_sasl=yes
-default_plugins=yes
-default_tts=yes
-default_asn=yes
-default_stun=yes
-default_pipechan=yes
-default_dtmf=yes
-default_wavfile=yes
-default_socks=yes
-default_ftp=yes
-default_snmp=yes
-default_telnet=yes
-default_remconn=no
-default_serial=yes
-default_pop3smtp=yes
-default_audio=yes
-default_video=yes
-default_url=yes
-default_http=yes
-default_httpforms=yes
-default_httpsvc=yes
-default_soap=yes
-default_xmlrpc=yes
-default_jabber=yes
-default_configfile=yes
+HAS_PLUGINS=1
+HAS_TTS=1
+HAS_ASN=1
+HAS_STUN=1
+HAS_PIPECHAN=1
+HAS_DTMF=1
+HAS_WAVFILE=1
+HAS_SOCKS=1
+HAS_FTP=1
+HAS_SNMP=1
+HAS_TELNET=1
+HAS_REMCONN=1
+HAS_SERIAL=1
+HAS_POP3SMTP=1
+HAS_AUDIO=1
+HAS_VIDEO=1
+HAS_URL=1
+HAS_HTTP=1
+HAS_HTTPFORMS=1
+HAS_HTTPSVC=1
+HAS_SOAP=1
+HAS_XMLRPC=1
+HAS_JABBER=1
+HAS_CONFIG_FILE=1
default_alsa=yes
default_oss=yes
default_ipv6=yes
default_qos=yes
-default_sockagg=yes
-default_vidfile=yes
+HAS_SOCKAGG=1
+HAS_VIDFILE=1
+HAS_APPSHARE=
default_shmvideo=yes
-default_vxml=yes
+HAS_VXML=1
if test "${enable_openh323}x" = "yesx" -o "${enable_opal}x" = "yesx" ; then
default_resolver=yes
@@ -5799,38 +5800,39 @@
default_expat=no
default_sdl=yes
default_sasl=no
- default_plugins=yes
- default_tts=yes
- default_asn=yes
- default_stun=yes
- default_pipechan=yes
- default_dtmf=yes
- default_wavfile=yes
- default_socks=no
- default_ftp=no
- default_snmp=no
- default_telnet=no
- default_remconn=no
- default_serial=no
- default_pop3smtp=no
- default_audio=yes
- default_video=yes
- default_url=yes
- default_http=yes
- default_httpforms=no
- default_httpsvc=no
- default_soap=no
- default_xmlrpc=no
- default_jabber=no
- default_configfile=yes
+ HAS_PLUGINS=1
+ HAS_TTS=1
+ HAS_ASN=1
+ HAS_STUN=1
+ HAS_PIPECHAN=1
+ HAS_DTMF=1
+ HAS_WAVFILE=1
+ HAS_SOCKS=
+ HAS_FTP=
+ HAS_SNMP=
+ HAS_TELNET=
+ HAS_REMCONN=
+ HAS_SERIAL=
+ HAS_POP3SMTP=
+ HAS_AUDIO=1
+ HAS_VIDEO=1
+ HAS_URL=1
+ HAS_HTTP=1
+ HAS_HTTPFORMS=
+ HAS_HTTPSVC=
+ HAS_SOAP=
+ HAS_XMLRPC=
+ HAS_JABBER=
+ HAS_CONFIG_FILE=1
default_alsa=yes
default_oss=yes
default_ipv6=yes
default_qos=yes
- default_sockagg=yes
- default_vidfile=yes
+ HAS_SOCKAGG=1
+ HAS_VIDFILE=1
+ HAS_APPSHARE=
default_shmvideo=no
- default_vxml=yes
+ HAS_VXML=1
elif test "${enable_minsize}x" = "yesx" ; then
default_resolver=no
default_openldap=no
@@ -5838,38 +5840,39 @@
default_expat=no
default_sdl=no
default_sasl=no
- default_plugins=yes
- default_tts=no
- default_asn=yes
- default_stun=yes
- default_pipechan=no
- default_dtmf=no
- default_wavfile=no
- default_socks=no
- default_ftp=no
- default_snmp=no
- default_telnet=no
- default_remconn=no
- default_serial=no
- default_pop3smtp=no
- default_audio=yes
- default_video=yes
- default_url=yes
- default_http=yes
- default_httpforms=no
- default_httpsvc=no
- default_soap=no
- default_xmlrpc=no
- default_jabber=no
- default_configfile=no
+ HAS_PLUGINS=1
+ HAS_TTS=
+ HAS_ASN=1
+ HAS_STUN=1
+ HAS_PIPECHAN=
+ HAS_DTMF=
+ HAS_WAVFILE=
+ HAS_SOCKS=
+ HAS_FTP=
+ HAS_SNMP=
+ HAS_TELNET=
+ HAS_REMCONN=
+ HAS_SERIAL=
+ HAS_POP3SMTP=
+ HAS_AUDIO=1
+ HAS_VIDEO=!
+ HAS_URL=1
+ HAS_HTTP=1
+ HAS_HTTPFORMS=
+ HAS_HTTPSVC=
+ HAS_SOAP=
+ HAS_XMLRPC=
+ HAS_JABBER=
+ HAS_CONFIG_FILE=0
default_alsa=yes
default_oss=no
default_ipv6=no
default_qos=no
- default_sockagg=yes
- default_vidfile=no
+ HAS_SOCKAGG=1
+ HAS_VIDFILE=1
+ HAS_APPSHARE=
default_shmvideo=no
- default_vxml=no
+ HAS_VXML=
fi
@@ -7426,13 +7429,13 @@
fi
fi
if test $ptlib_libdl = yes; then
- HAS_LIBDL=yes
+ HAS_LIBDL=1
else
- HAS_LIBDL=no
+ HAS_LIBDL=
fi
-if test "x$HAS_LIBDL" = "xyes" ; then
+if test "x$HAS_LIBDL" = "x1" ; then
cat >>confdefs.h <<\_ACEOF
#define P_DYNALINK 1
@@ -7442,38 +7445,56 @@
-plugins="no"
-{ echo "$as_me:$LINENO: checking if plugins support needs to be compiled" >&5
-echo $ECHO_N "checking if plugins support needs to be compiled... $ECHO_C" >&6; }
-# Check whether --enable-plugins was given.
+ { echo "$as_me:$LINENO: checking enable plugin support" >&5
+echo $ECHO_N "checking enable plugin support... $ECHO_C" >&6; }
+ # Check whether --enable-plugins was given.
if test "${enable_plugins+set}" = set; then
enableval=$enable_plugins;
-fi
+ if test "x$enableval" = "xyes"; then
+ HAS_PLUGINS=1
+ else
+ HAS_PLUGINS=
+ fi
-if test "${enable_plugins}z" = "z" ; then
- enable_plugins=default_plugins
fi
-HAS_PLUGINS=
-if test "${enable_plugins}" = "no" ; then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-elif test "x${HAS_LIBDL}" != "xyes" ; then
- { echo "$as_me:$LINENO: result: plugins disabled as dlopen not available" >&5
-echo "${ECHO_T}plugins disabled as dlopen not available" >&6; }
-else
- { echo "$as_me:$LINENO: result: plugins enabled" >&5
-echo "${ECHO_T}plugins enabled" >&6; }
- HAS_PLUGINS=1
+ if test "xHAS_LIBDL" != "x"; then
+ if test "x$HAS_LIBDL" != "x1"; then
+ { echo "$as_me:$LINENO: plugins support disabled due to disabled dependency HAS_LIBDL" >&5
+echo "$as_me: plugins support disabled due to disabled dependency HAS_LIBDL" >&6;}
+ HAS_PLUGINS=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: plugins support disabled due to disabled dependency " >&5
+echo "$as_me: plugins support disabled due to disabled dependency " >&6;}
+ HAS_PLUGINS=
+ fi
+ fi
+
+
+ if test "x${HAS_PLUGINS}" = "x1"; then
+
cat >>confdefs.h <<\_ACEOF
-#define P_HAS_PLUGINS 1
+#define P_PLUGINS 1
_ACEOF
-fi
+ HAS_PLUGINS=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_PLUGINS=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
if test "x$LIB64" != "x" ; then
cat >>confdefs.h <<_ACEOF
@@ -7489,32 +7510,59 @@
fi
-{ echo "$as_me:$LINENO: checking if sample support needs to be compiled" >&5
-echo $ECHO_N "checking if sample support needs to be compiled... $ECHO_C" >&6; }
-# Check whether --enable-samples was given.
+
+ { echo "$as_me:$LINENO: checking enable samples build" >&5
+echo $ECHO_N "checking enable samples build... $ECHO_C" >&6; }
+ # Check whether --enable-samples was given.
if test "${enable_samples+set}" = set; then
enableval=$enable_samples;
+ if test "x$enableval" = "xyes"; then
+ HAS_SAMPLES=1
+ else
+ HAS_SAMPLES=
+ fi
+
fi
-if test "${enable_samples}z" = "z" ; then
- enable_samples=$default_samples
-fi
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: samples support disabled due to disabled dependency " >&5
+echo "$as_me: samples support disabled due to disabled dependency " >&6;}
+ HAS_SAMPLES=
+ fi
+ fi
-HAS_SAMPLES=
-if test "${enable_samples}" = "no" ; then
- { echo "$as_me:$LINENO: result: no" >&5
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: samples support disabled due to disabled dependency " >&5
+echo "$as_me: samples support disabled due to disabled dependency " >&6;}
+ HAS_SAMPLES=
+ fi
+ fi
+
+
+ if test "x${HAS_SAMPLES}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_SAMPLES 1
+_ACEOF
+
+ HAS_SAMPLES=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_SAMPLES=
+ { echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-else
- { echo "$as_me:$LINENO: result: samples enabled" >&5
-echo "${ECHO_T}samples enabled" >&6; }
- HAS_SAMPLES=1
-fi
+ fi
+
+
# Check whether --enable-resolver was given.
if test "${enable_resolver+set}" = set; then
enableval=$enable_resolver; enable_resolver=$enableval
@@ -9389,155 +9437,9 @@
-# Check whether --enable-configfile was given.
-if test "${enable_configfile+set}" = set; then
- enableval=$enable_configfile;
-fi
-if test "${enable_configfile}z" = "z" ; then
- enable_configfile=$default_configfile
-fi
-HAS_CONFIG_FILE=
-if test "$enable_configfile" = "no" ; then
- { echo "$as_me:$LINENO: Config file support disabled" >&5
-echo "$as_me: Config file support disabled" >&6;}
-else
- HAS_CONFIG_FILE=1
- cat >>confdefs.h <<\_ACEOF
-#define P_CONFIG_FILE 1
-_ACEOF
-
-fi
-
-
-
-
-
-# Check whether --enable-url was given.
-if test "${enable_url+set}" = set; then
- enableval=$enable_url;
-fi
-
-
-if test "${enable_url}z" = "z" ; then
- enable_url=$default_url
-fi
-
-HAS_URL=
-if test "$enable_url" = "no" ; then
- { echo "$as_me:$LINENO: URL protocol support disabled" >&5
-echo "$as_me: URL protocol support disabled" >&6;}
-else
- HAS_URL=1
- cat >>confdefs.h <<\_ACEOF
-#define P_URL 1
-_ACEOF
-
-fi
-
-
-
-
-
-# Check whether --enable-http was given.
-if test "${enable_http+set}" = set; then
- enableval=$enable_http;
-fi
-
-
-HAS_HTTP=
-if test "$enable_url" = "no" ; then
- { echo "$as_me:$LINENO: HTTP disabled as URL is disabled" >&5
-echo "$as_me: HTTP disabled as URL is disabled" >&6;}
- enable_http=no
-else
- if test "${enable_http}z" = "z" ; then
- enable_http=$default_http
- fi
-
- if test "$enable_http" = "no" ; then
- { echo "$as_me:$LINENO: HTTP protocol support disabled" >&5
-echo "$as_me: HTTP protocol support disabled" >&6;}
- else
- HAS_HTTP=1
- cat >>confdefs.h <<\_ACEOF
-#define P_HTTP 1
-_ACEOF
-
- fi
-fi
-
-
-
-
-
-# Check whether --enable-httpforms was given.
-if test "${enable_httpforms+set}" = set; then
- enableval=$enable_httpforms;
-fi
-
-
-HAS_HTTPFORMS=
-if test "$enable_http" = "no" ; then
- { echo "$as_me:$LINENO: HTTP forms disabled as HTTP is disabled" >&5
-echo "$as_me: HTTP forms disabled as HTTP is disabled" >&6;}
- enable_httpforms=no
-else
- if test "${enable_httpforms}z" = "z" ; then
- enable_httpforms=$default_httpsvc
- fi
-
- if test "$enable_httpforms" = "no" ; then
- { echo "$as_me:$LINENO: HTTP forms support disabled" >&5
-echo "$as_me: HTTP forms support disabled" >&6;}
- else
- HAS_HTTPFORMS=1
- cat >>confdefs.h <<\_ACEOF
-#define P_HTTPFORMS 1
-_ACEOF
-
- fi
-fi
-
-
-
-
-
-# Check whether --enable-httpsvc was given.
-if test "${enable_httpsvc+set}" = set; then
- enableval=$enable_httpsvc;
-fi
-
-
-HAS_HTTPSVC=
-if test "$enable_httpforms" = "no" ; then
- { echo "$as_me:$LINENO: HTTP service disabled as HTTP forms is disabled" >&5
-echo "$as_me: HTTP service disabled as HTTP forms is disabled" >&6;}
- enable_httpsvc=no
-else
- if test "${enable_httpsvc}z" = "z" ; then
- enable_httpsvc=$default_httpsvc
- fi
-
- if test "$enable_httpsvc" = "no" ; then
- { echo "$as_me:$LINENO: HTTP service support disabled" >&5
-echo "$as_me: HTTP service support disabled" >&6;}
- else
- HAS_HTTPSVC=1
- cat >>confdefs.h <<\_ACEOF
-#define P_HTTPSVC 1
-_ACEOF
-
- fi
-fi
-
-
-
-
-
-
# Check whether --enable-expat was given.
if test "${enable_expat+set}" = set; then
enableval=$enable_expat;
@@ -10068,151 +9970,6 @@
-HAS_VXML=
-HAS_JABBER=
-HAS_XMLRPC=
-HAS_SOAP=
-if test "$enable_expat" = "no" ; then
- { echo "$as_me:$LINENO: VXML disabled as Expat is disabled" >&5
-echo "$as_me: VXML disabled as Expat is disabled" >&6;}
- { echo "$as_me:$LINENO: Jabber disabled as Expat is disabled" >&5
-echo "$as_me: Jabber disabled as Expat is disabled" >&6;}
- { echo "$as_me:$LINENO: XMLRPC disabled as Expat is disabled" >&5
-echo "$as_me: XMLRPC disabled as Expat is disabled" >&6;}
- { echo "$as_me:$LINENO: SOAP disabled as Expat is disabled" >&5
-echo "$as_me: SOAP disabled as Expat is disabled" >&6;}
-else
-
-
-
- # Check whether --enable-jabber was given.
-if test "${enable_jabber+set}" = set; then
- enableval=$enable_jabber;
-fi
-
-
- if test "${enable_jabber}z" = "z" ; then
- enable_jabber=$default_jabber
- fi
- if test "$enable_jabber" = "no" ; then
- { echo "$as_me:$LINENO: Jabber disabled" >&5
-echo "$as_me: Jabber disabled" >&6;}
- else
- cat >>confdefs.h <<\_ACEOF
-#define P_JABBER 1
-_ACEOF
-
- HAS_JABBER=1
- fi
-
- if test "$enable_http" = "no" ; then
- { echo "$as_me:$LINENO: VXML disabled as HTTP is disabled" >&5
-echo "$as_me: VXML disabled as HTTP is disabled" >&6;}
- { echo "$as_me:$LINENO: XMLRPC disabled as HTTP is disabled" >&5
-echo "$as_me: XMLRPC disabled as HTTP is disabled" >&6;}
- { echo "$as_me:$LINENO: SOAP disabled as HTTP is disabled" >&5
-echo "$as_me: SOAP disabled as HTTP is disabled" >&6;}
- else
-
-
- # Check whether --enable-vxml was given.
-if test "${enable_vxml+set}" = set; then
- enableval=$enable_vxml;
-fi
-
-
- if test "${enable_vxml}z" = "z" ; then
- enable_vxml=$default_vxml
- fi
- if test "$enable_vxml" = "no" ; then
- { echo "$as_me:$LINENO: VXML disabled" >&5
-echo "$as_me: VXML disabled" >&6;}
- else
- cat >>confdefs.h <<\_ACEOF
-#define P_VXML 1
-_ACEOF
-
- HAS_VXML=1
- fi
-
-
-
- # Check whether --enable-xmlrpc was given.
-if test "${enable_xmlrpc+set}" = set; then
- enableval=$enable_xmlrpc;
-fi
-
-
- if test "${enable_xmlrpc}z" = "z" ; then
- enable_xmlrpc=$default_xmlrpc
- fi
- if test "$enable_xmlrpc" = "no" ; then
- { echo "$as_me:$LINENO: XMLRPC disabled" >&5
-echo "$as_me: XMLRPC disabled" >&6;}
- else
- cat >>confdefs.h <<\_ACEOF
-#define P_XMLRPC 1
-_ACEOF
-
- HAS_XMLRPC=1
- fi
-
-
-
- # Check whether --enable-soap was given.
-if test "${enable_soap+set}" = set; then
- enableval=$enable_soap;
-fi
-
-
- if test "${enable_soap}z" = "z" ; then
- enable_soap=$default_soap
- fi
- if test "$enable_soap" = "no" ; then
- { echo "$as_me:$LINENO: SOAP disabled" >&5
-echo "$as_me: SOAP disabled" >&6;}
- else
- cat >>confdefs.h <<\_ACEOF
-#define P_SOAP 1
-_ACEOF
-
- HAS_SOAP=1
- fi
- fi
-fi
-
-
-
-
-
-
-
-
-# Check whether --enable-expat was given.
-if test "${enable_expat+set}" = set; then
- enableval=$enable_expat;
-fi
-
-
-if test "${enable_tts}z" = "z" ; then
- enable_tts=$default_tts
-fi
-
-HAS_TTS=
-if test "$enable_tts" = "no" ; then
- { echo "$as_me:$LINENO: Text-to-speech disabled" >&5
-echo "$as_me: Text-to-speech disabled" >&6;}
-else
- cat >>confdefs.h <<\_ACEOF
-#define P_TTS 1
-_ACEOF
-
- HAS_TTS=1
-fi
-
-
-
-
# Check whether --enable-ipv6 was given.
if test "${enable_ipv6+set}" = set; then
enableval=$enable_ipv6;
@@ -10396,27 +10153,6 @@
-# Check whether --enable-qos was given.
-if test "${enable_qos+set}" = set; then
- enableval=$enable_qos;
-fi
-
-
-if test "${enable_qos}z" = "z" ; then
- enable_qos=$default_qos
-fi
-
-if test "$enable_qos" != "no" ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define P_HAS_QOS 1
-_ACEOF
-
-fi
-
-
-
-
# Check whether --enable-sdl was given.
if test "${enable_sdl+set}" = set; then
enableval=$enable_sdl; enable_sdl=$enableval
@@ -10519,36 +10255,1442 @@
-# Check whether --enable-video was given.
+ { echo "$as_me:$LINENO: checking enable config file support" >&5
+echo $ECHO_N "checking enable config file support... $ECHO_C" >&6; }
+ # Check whether --enable-configfile was given.
+if test "${enable_configfile+set}" = set; then
+ enableval=$enable_configfile;
+ if test "x$enableval" = "xyes"; then
+ HAS_CONFIG_FILE=1
+ else
+ HAS_CONFIG_FILE=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: configfile support disabled due to disabled dependency " >&5
+echo "$as_me: configfile support disabled due to disabled dependency " >&6;}
+ HAS_CONFIG_FILE=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: configfile support disabled due to disabled dependency " >&5
+echo "$as_me: configfile support disabled due to disabled dependency " >&6;}
+ HAS_CONFIG_FILE=
+ fi
+ fi
+
+
+ if test "x${HAS_CONFIG_FILE}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_CONFIG_FILE 1
+_ACEOF
+
+ HAS_CONFIG_FILE=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_CONFIG_FILE=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable URL support" >&5
+echo $ECHO_N "checking enable URL support... $ECHO_C" >&6; }
+ # Check whether --enable-url was given.
+if test "${enable_url+set}" = set; then
+ enableval=$enable_url;
+ if test "x$enableval" = "xyes"; then
+ HAS_URL=1
+ else
+ HAS_URL=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: url support disabled due to disabled dependency " >&5
+echo "$as_me: url support disabled due to disabled dependency " >&6;}
+ HAS_URL=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: url support disabled due to disabled dependency " >&5
+echo "$as_me: url support disabled due to disabled dependency " >&6;}
+ HAS_URL=
+ fi
+ fi
+
+
+ if test "x${HAS_URL}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_URL 1
+_ACEOF
+
+ HAS_URL=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_URL=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable HTTP support" >&5
+echo $ECHO_N "checking enable HTTP support... $ECHO_C" >&6; }
+ # Check whether --enable-http was given.
+if test "${enable_http+set}" = set; then
+ enableval=$enable_http;
+ if test "x$enableval" = "xyes"; then
+ HAS_HTTP=1
+ else
+ HAS_HTTP=
+ fi
+
+fi
+
+
+ if test "xHAS_URL" != "x"; then
+ if test "x$HAS_URL" != "x1"; then
+ { echo "$as_me:$LINENO: http support disabled due to disabled dependency HAS_URL" >&5
+echo "$as_me: http support disabled due to disabled dependency HAS_URL" >&6;}
+ HAS_HTTP=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: http support disabled due to disabled dependency " >&5
+echo "$as_me: http support disabled due to disabled dependency " >&6;}
+ HAS_HTTP=
+ fi
+ fi
+
+
+ if test "x${HAS_HTTP}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_HTTP 1
+_ACEOF
+
+ HAS_HTTP=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_HTTP=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable HTTP forms support" >&5
+echo $ECHO_N "checking enable HTTP forms support... $ECHO_C" >&6; }
+ # Check whether --enable-httpforms was given.
+if test "${enable_httpforms+set}" = set; then
+ enableval=$enable_httpforms;
+ if test "x$enableval" = "xyes"; then
+ HAS_HTTPFORMS=1
+ else
+ HAS_HTTPFORMS=
+ fi
+
+fi
+
+
+ if test "xHAS_HTTP" != "x"; then
+ if test "x$HAS_HTTP" != "x1"; then
+ { echo "$as_me:$LINENO: httpforms support disabled due to disabled dependency HAS_HTTP" >&5
+echo "$as_me: httpforms support disabled due to disabled dependency HAS_HTTP" >&6;}
+ HAS_HTTPFORMS=
+ fi
+ fi
+
+ if test "xHAS_CONFIG_FILE" != "x"; then
+ if test "x$HAS_CONFIG_FILE" != "x1"; then
+ { echo "$as_me:$LINENO: httpforms support disabled due to disabled dependency HAS_CONFIG_FILE" >&5
+echo "$as_me: httpforms support disabled due to disabled dependency HAS_CONFIG_FILE" >&6;}
+ HAS_HTTPFORMS=
+ fi
+ fi
+
+
+ if test "x${HAS_HTTPFORMS}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_HTTPFORMS 1
+_ACEOF
+
+ HAS_HTTPFORMS=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_HTTPFORMS=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable HTTP server support" >&5
+echo $ECHO_N "checking enable HTTP server support... $ECHO_C" >&6; }
+ # Check whether --enable-httpsvc was given.
+if test "${enable_httpsvc+set}" = set; then
+ enableval=$enable_httpsvc;
+ if test "x$enableval" = "xyes"; then
+ HAS_HTTPSVC=1
+ else
+ HAS_HTTPSVC=
+ fi
+
+fi
+
+
+ if test "xHAS_HTTPFORMS" != "x"; then
+ if test "x$HAS_HTTPFORMS" != "x1"; then
+ { echo "$as_me:$LINENO: httpsvc support disabled due to disabled dependency HAS_HTTPFORMS" >&5
+echo "$as_me: httpsvc support disabled due to disabled dependency HAS_HTTPFORMS" >&6;}
+ HAS_HTTPSVC=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: httpsvc support disabled due to disabled dependency " >&5
+echo "$as_me: httpsvc support disabled due to disabled dependency " >&6;}
+ HAS_HTTPSVC=
+ fi
+ fi
+
+
+ if test "x${HAS_HTTPSVC}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_HTTPSVC 1
+_ACEOF
+
+ HAS_HTTPSVC=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_HTTPSVC=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable Jabber support" >&5
+echo $ECHO_N "checking enable Jabber support... $ECHO_C" >&6; }
+ # Check whether --enable-jabber was given.
+if test "${enable_jabber+set}" = set; then
+ enableval=$enable_jabber;
+ if test "x$enableval" = "xyes"; then
+ HAS_JABBER=1
+ else
+ HAS_JABBER=
+ fi
+
+fi
+
+
+ if test "xHAS_EXPAT" != "x"; then
+ if test "x$HAS_EXPAT" != "x1"; then
+ { echo "$as_me:$LINENO: jabber support disabled due to disabled dependency HAS_EXPAT" >&5
+echo "$as_me: jabber support disabled due to disabled dependency HAS_EXPAT" >&6;}
+ HAS_JABBER=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: jabber support disabled due to disabled dependency " >&5
+echo "$as_me: jabber support disabled due to disabled dependency " >&6;}
+ HAS_JABBER=
+ fi
+ fi
+
+
+ if test "x${HAS_JABBER}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_JABBER 1
+_ACEOF
+
+ HAS_JABBER=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_JABBER=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable VXML support" >&5
+echo $ECHO_N "checking enable VXML support... $ECHO_C" >&6; }
+ # Check whether --enable-vxml was given.
+if test "${enable_vxml+set}" = set; then
+ enableval=$enable_vxml;
+ if test "x$enableval" = "xyes"; then
+ HAS_VXML=1
+ else
+ HAS_VXML=
+ fi
+
+fi
+
+
+ if test "xHAS_EXPAT" != "x"; then
+ if test "x$HAS_EXPAT" != "x1"; then
+ { echo "$as_me:$LINENO: vxml support disabled due to disabled dependency HAS_EXPAT" >&5
+echo "$as_me: vxml support disabled due to disabled dependency HAS_EXPAT" >&6;}
+ HAS_VXML=
+ fi
+ fi
+
+ if test "xHAS_HTTP" != "x"; then
+ if test "x$HAS_HTTP" != "x1"; then
+ { echo "$as_me:$LINENO: vxml support disabled due to disabled dependency HAS_HTTP" >&5
+echo "$as_me: vxml support disabled due to disabled dependency HAS_HTTP" >&6;}
+ HAS_VXML=
+ fi
+ fi
+
+
+ if test "x${HAS_VXML}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_VXML 1
+_ACEOF
+
+ HAS_VXML=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_VXML=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable XMLRPC support" >&5
+echo $ECHO_N "checking enable XMLRPC support... $ECHO_C" >&6; }
+ # Check whether --enable-xmlrpc was given.
+if test "${enable_xmlrpc+set}" = set; then
+ enableval=$enable_xmlrpc;
+ if test "x$enableval" = "xyes"; then
+ HAS_XMLRPC=1
+ else
+ HAS_XMLRPC=
+ fi
+
+fi
+
+
+ if test "xHAS_EXPAT" != "x"; then
+ if test "x$HAS_EXPAT" != "x1"; then
+ { echo "$as_me:$LINENO: xmlrpc support disabled due to disabled dependency HAS_EXPAT" >&5
+echo "$as_me: xmlrpc support disabled due to disabled dependency HAS_EXPAT" >&6;}
+ HAS_XMLRPC=
+ fi
+ fi
+
+ if test "xHAS_HTTP" != "x"; then
+ if test "x$HAS_HTTP" != "x1"; then
+ { echo "$as_me:$LINENO: xmlrpc support disabled due to disabled dependency HAS_HTTP" >&5
+echo "$as_me: xmlrpc support disabled due to disabled dependency HAS_HTTP" >&6;}
+ HAS_XMLRPC=
+ fi
+ fi
+
+
+ if test "x${HAS_XMLRPC}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_XMLRPC 1
+_ACEOF
+
+ HAS_XMLRPC=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_XMLRPC=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable SOAP support" >&5
+echo $ECHO_N "checking enable SOAP support... $ECHO_C" >&6; }
+ # Check whether --enable-soap was given.
+if test "${enable_soap+set}" = set; then
+ enableval=$enable_soap;
+ if test "x$enableval" = "xyes"; then
+ HAS_SOAP=1
+ else
+ HAS_SOAP=
+ fi
+
+fi
+
+
+ if test "xHAS_EXPAT" != "x"; then
+ if test "x$HAS_EXPAT" != "x1"; then
+ { echo "$as_me:$LINENO: soap support disabled due to disabled dependency HAS_EXPAT" >&5
+echo "$as_me: soap support disabled due to disabled dependency HAS_EXPAT" >&6;}
+ HAS_SOAP=
+ fi
+ fi
+
+ if test "xHAS_HTTP" != "x"; then
+ if test "x$HAS_HTTP" != "x1"; then
+ { echo "$as_me:$LINENO: soap support disabled due to disabled dependency HAS_HTTP" >&5
+echo "$as_me: soap support disabled due to disabled dependency HAS_HTTP" >&6;}
+ HAS_SOAP=
+ fi
+ fi
+
+
+ if test "x${HAS_SOAP}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_SOAP 1
+_ACEOF
+
+ HAS_SOAP=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_SOAP=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable Text-To-Speech server support" >&5
+echo $ECHO_N "checking enable Text-To-Speech server support... $ECHO_C" >&6; }
+ # Check whether --enable-tts was given.
+if test "${enable_tts+set}" = set; then
+ enableval=$enable_tts;
+ if test "x$enableval" = "xyes"; then
+ HAS_TTS=1
+ else
+ HAS_TTS=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: tts support disabled due to disabled dependency " >&5
+echo "$as_me: tts support disabled due to disabled dependency " >&6;}
+ HAS_TTS=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: tts support disabled due to disabled dependency " >&5
+echo "$as_me: tts support disabled due to disabled dependency " >&6;}
+ HAS_TTS=
+ fi
+ fi
+
+
+ if test "x${HAS_TTS}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_TTS 1
+_ACEOF
+
+ HAS_TTS=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_TTS=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable ASN decoding/encoding support" >&5
+echo $ECHO_N "checking enable ASN decoding/encoding support... $ECHO_C" >&6; }
+ # Check whether --enable-asn was given.
+if test "${enable_asn+set}" = set; then
+ enableval=$enable_asn;
+ if test "x$enableval" = "xyes"; then
+ HAS_ASN=1
+ else
+ HAS_ASN=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: asn support disabled due to disabled dependency " >&5
+echo "$as_me: asn support disabled due to disabled dependency " >&6;}
+ HAS_ASN=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: asn support disabled due to disabled dependency " >&5
+echo "$as_me: asn support disabled due to disabled dependency " >&6;}
+ HAS_ASN=
+ fi
+ fi
+
+
+ if test "x${HAS_ASN}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_ASN 1
+_ACEOF
+
+ HAS_ASN=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_ASN=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable STUN support" >&5
+echo $ECHO_N "checking enable STUN support... $ECHO_C" >&6; }
+ # Check whether --enable-stun was given.
+if test "${enable_stun+set}" = set; then
+ enableval=$enable_stun;
+ if test "x$enableval" = "xyes"; then
+ HAS_STUN=1
+ else
+ HAS_STUN=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: stun support disabled due to disabled dependency " >&5
+echo "$as_me: stun support disabled due to disabled dependency " >&6;}
+ HAS_STUN=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: stun support disabled due to disabled dependency " >&5
+echo "$as_me: stun support disabled due to disabled dependency " >&6;}
+ HAS_STUN=
+ fi
+ fi
+
+
+ if test "x${HAS_STUN}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_STUN 1
+_ACEOF
+
+ HAS_STUN=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_STUN=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable pipechannel support" >&5
+echo $ECHO_N "checking enable pipechannel support... $ECHO_C" >&6; }
+ # Check whether --enable-pipechan was given.
+if test "${enable_pipechan+set}" = set; then
+ enableval=$enable_pipechan;
+ if test "x$enableval" = "xyes"; then
+ HAS_PIPECHAN=1
+ else
+ HAS_PIPECHAN=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: pipechan support disabled due to disabled dependency " >&5
+echo "$as_me: pipechan support disabled due to disabled dependency " >&6;}
+ HAS_PIPECHAN=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: pipechan support disabled due to disabled dependency " >&5
+echo "$as_me: pipechan support disabled due to disabled dependency " >&6;}
+ HAS_PIPECHAN=
+ fi
+ fi
+
+
+ if test "x${HAS_PIPECHAN}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_PIPECHAN 1
+_ACEOF
+
+ HAS_PIPECHAN=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_PIPECHAN=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable DTMF protocol support" >&5
+echo $ECHO_N "checking enable DTMF protocol support... $ECHO_C" >&6; }
+ # Check whether --enable-dtmf was given.
+if test "${enable_dtmf+set}" = set; then
+ enableval=$enable_dtmf;
+ if test "x$enableval" = "xyes"; then
+ HAS_DTMF=1
+ else
+ HAS_DTMF=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: dtmf support disabled due to disabled dependency " >&5
+echo "$as_me: dtmf support disabled due to disabled dependency " >&6;}
+ HAS_DTMF=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: dtmf support disabled due to disabled dependency " >&5
+echo "$as_me: dtmf support disabled due to disabled dependency " >&6;}
+ HAS_DTMF=
+ fi
+ fi
+
+
+ if test "x${HAS_DTMF}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_DTMF 1
+_ACEOF
+
+ HAS_DTMF=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_DTMF=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable WAVFILE support" >&5
+echo $ECHO_N "checking enable WAVFILE support... $ECHO_C" >&6; }
+ # Check whether --enable-wavfile was given.
+if test "${enable_wavfile+set}" = set; then
+ enableval=$enable_wavfile;
+ if test "x$enableval" = "xyes"; then
+ HAS_WAVFILE=1
+ else
+ HAS_WAVFILE=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: wavfile support disabled due to disabled dependency " >&5
+echo "$as_me: wavfile support disabled due to disabled dependency " >&6;}
+ HAS_WAVFILE=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: wavfile support disabled due to disabled dependency " >&5
+echo "$as_me: wavfile support disabled due to disabled dependency " >&6;}
+ HAS_WAVFILE=
+ fi
+ fi
+
+
+ if test "x${HAS_WAVFILE}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_WAVFILE 1
+_ACEOF
+
+ HAS_WAVFILE=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_WAVFILE=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable SOCKS protocol support" >&5
+echo $ECHO_N "checking enable SOCKS protocol support... $ECHO_C" >&6; }
+ # Check whether --enable-socks was given.
+if test "${enable_socks+set}" = set; then
+ enableval=$enable_socks;
+ if test "x$enableval" = "xyes"; then
+ HAS_SOCKS=1
+ else
+ HAS_SOCKS=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: socks support disabled due to disabled dependency " >&5
+echo "$as_me: socks support disabled due to disabled dependency " >&6;}
+ HAS_SOCKS=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: socks support disabled due to disabled dependency " >&5
+echo "$as_me: socks support disabled due to disabled dependency " >&6;}
+ HAS_SOCKS=
+ fi
+ fi
+
+
+ if test "x${HAS_SOCKS}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_SOCKS 1
+_ACEOF
+
+ HAS_SOCKS=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_SOCKS=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable FTP protocol support" >&5
+echo $ECHO_N "checking enable FTP protocol support... $ECHO_C" >&6; }
+ # Check whether --enable-ftp was given.
+if test "${enable_ftp+set}" = set; then
+ enableval=$enable_ftp;
+ if test "x$enableval" = "xyes"; then
+ HAS_FTP=1
+ else
+ HAS_FTP=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: ftp support disabled due to disabled dependency " >&5
+echo "$as_me: ftp support disabled due to disabled dependency " >&6;}
+ HAS_FTP=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: ftp support disabled due to disabled dependency " >&5
+echo "$as_me: ftp support disabled due to disabled dependency " >&6;}
+ HAS_FTP=
+ fi
+ fi
+
+
+ if test "x${HAS_FTP}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_FTP 1
+_ACEOF
+
+ HAS_FTP=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_FTP=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable SNMP protocol support" >&5
+echo $ECHO_N "checking enable SNMP protocol support... $ECHO_C" >&6; }
+ # Check whether --enable-snmp was given.
+if test "${enable_snmp+set}" = set; then
+ enableval=$enable_snmp;
+ if test "x$enableval" = "xyes"; then
+ HAS_SNMP=1
+ else
+ HAS_SNMP=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: snmp support disabled due to disabled dependency " >&5
+echo "$as_me: snmp support disabled due to disabled dependency " >&6;}
+ HAS_SNMP=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: snmp support disabled due to disabled dependency " >&5
+echo "$as_me: snmp support disabled due to disabled dependency " >&6;}
+ HAS_SNMP=
+ fi
+ fi
+
+
+ if test "x${HAS_SNMP}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_SNMP 1
+_ACEOF
+
+ HAS_SNMP=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_SNMP=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable TELNET protocol support" >&5
+echo $ECHO_N "checking enable TELNET protocol support... $ECHO_C" >&6; }
+ # Check whether --enable-telnet was given.
+if test "${enable_telnet+set}" = set; then
+ enableval=$enable_telnet;
+ if test "x$enableval" = "xyes"; then
+ HAS_TELNET=1
+ else
+ HAS_TELNET=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: telnet support disabled due to disabled dependency " >&5
+echo "$as_me: telnet support disabled due to disabled dependency " >&6;}
+ HAS_TELNET=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: telnet support disabled due to disabled dependency " >&5
+echo "$as_me: telnet support disabled due to disabled dependency " >&6;}
+ HAS_TELNET=
+ fi
+ fi
+
+
+ if test "x${HAS_TELNET}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_TELNET 1
+_ACEOF
+
+ HAS_TELNET=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_TELNET=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable remote connection support" >&5
+echo $ECHO_N "checking enable remote connection support... $ECHO_C" >&6; }
+ # Check whether --enable-remconn was given.
+if test "${enable_remconn+set}" = set; then
+ enableval=$enable_remconn;
+ if test "x$enableval" = "xyes"; then
+ HAS_REMCONN=1
+ else
+ HAS_REMCONN=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: remconn support disabled due to disabled dependency " >&5
+echo "$as_me: remconn support disabled due to disabled dependency " >&6;}
+ HAS_REMCONN=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: remconn support disabled due to disabled dependency " >&5
+echo "$as_me: remconn support disabled due to disabled dependency " >&6;}
+ HAS_REMCONN=
+ fi
+ fi
+
+
+ if test "x${HAS_REMCONN}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_REMCONN 1
+_ACEOF
+
+ HAS_REMCONN=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_REMCONN=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable serial port support" >&5
+echo $ECHO_N "checking enable serial port support... $ECHO_C" >&6; }
+ # Check whether --enable-serial was given.
+if test "${enable_serial+set}" = set; then
+ enableval=$enable_serial;
+ if test "x$enableval" = "xyes"; then
+ HAS_SERIAL=1
+ else
+ HAS_SERIAL=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: serial support disabled due to disabled dependency " >&5
+echo "$as_me: serial support disabled due to disabled dependency " >&6;}
+ HAS_SERIAL=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: serial support disabled due to disabled dependency " >&5
+echo "$as_me: serial support disabled due to disabled dependency " >&6;}
+ HAS_SERIAL=
+ fi
+ fi
+
+
+ if test "x${HAS_SERIAL}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_SERIAL 1
+_ACEOF
+
+ HAS_SERIAL=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_SERIAL=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable POP3/SMTP support" >&5
+echo $ECHO_N "checking enable POP3/SMTP support... $ECHO_C" >&6; }
+ # Check whether --enable-pop3smtp was given.
+if test "${enable_pop3smtp+set}" = set; then
+ enableval=$enable_pop3smtp;
+ if test "x$enableval" = "xyes"; then
+ HAS_POP3SMTP=1
+ else
+ HAS_POP3SMTP=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: pop3smtp support disabled due to disabled dependency " >&5
+echo "$as_me: pop3smtp support disabled due to disabled dependency " >&6;}
+ HAS_POP3SMTP=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: pop3smtp support disabled due to disabled dependency " >&5
+echo "$as_me: pop3smtp support disabled due to disabled dependency " >&6;}
+ HAS_POP3SMTP=
+ fi
+ fi
+
+
+ if test "x${HAS_POP3SMTP}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_POP3SMTP 1
+_ACEOF
+
+ HAS_POP3SMTP=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_POP3SMTP=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable socket aggregation" >&5
+echo $ECHO_N "checking enable socket aggregation... $ECHO_C" >&6; }
+ # Check whether --enable-sockagg was given.
+if test "${enable_sockagg+set}" = set; then
+ enableval=$enable_sockagg;
+ if test "x$enableval" = "xyes"; then
+ HAS_SOCKAGG=1
+ else
+ HAS_SOCKAGG=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: sockagg support disabled due to disabled dependency " >&5
+echo "$as_me: sockagg support disabled due to disabled dependency " >&6;}
+ HAS_SOCKAGG=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: sockagg support disabled due to disabled dependency " >&5
+echo "$as_me: sockagg support disabled due to disabled dependency " >&6;}
+ HAS_SOCKAGG=
+ fi
+ fi
+
+
+ if test "x${HAS_SOCKAGG}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_SOCKAGG 1
+_ACEOF
+
+ HAS_SOCKAGG=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_SOCKAGG=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable audio support" >&5
+echo $ECHO_N "checking enable audio support... $ECHO_C" >&6; }
+ # Check whether --enable-audio was given.
+if test "${enable_audio+set}" = set; then
+ enableval=$enable_audio;
+ if test "x$enableval" = "xyes"; then
+ HAS_AUDIO=1
+ else
+ HAS_AUDIO=
+ fi
+
+fi
+
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: audio support disabled due to disabled dependency " >&5
+echo "$as_me: audio support disabled due to disabled dependency " >&6;}
+ HAS_AUDIO=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: audio support disabled due to disabled dependency " >&5
+echo "$as_me: audio support disabled due to disabled dependency " >&6;}
+ HAS_AUDIO=
+ fi
+ fi
+
+
+ if test "x${HAS_AUDIO}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_AUDIO 1
+_ACEOF
+
+ HAS_AUDIO=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_AUDIO=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+
+# Check whether --enable-qos was given.
+if test "${enable_qos+set}" = set; then
+ enableval=$enable_qos;
+fi
+
+
+if test "${enable_qos}z" = "z" ; then
+ enable_qos=$default_qos
+fi
+
+if test "$enable_qos" != "no" ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_HAS_QOS 1
+_ACEOF
+
+fi
+
+
+
+ { echo "$as_me:$LINENO: checking enable video device support" >&5
+echo $ECHO_N "checking enable video device support... $ECHO_C" >&6; }
+ # Check whether --enable-video was given.
if test "${enable_video+set}" = set; then
enableval=$enable_video;
+ if test "x$enableval" = "xyes"; then
+ HAS_VIDEO=1
+ else
+ HAS_VIDEO=
+ fi
+
fi
-if test "${enable_video}z" = "z" ; then
- enable_video=$default_video
-fi
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: video support disabled due to disabled dependency " >&5
+echo "$as_me: video support disabled due to disabled dependency " >&6;}
+ HAS_VIDEO=
+ fi
+ fi
-HAS_VIDEO=
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: video support disabled due to disabled dependency " >&5
+echo "$as_me: video support disabled due to disabled dependency " >&6;}
+ HAS_VIDEO=
+ fi
+ fi
-if test "x$enable_video" = "xno" ; then
+ if test "x${HAS_VIDEO}" = "x1"; then
+
cat >>confdefs.h <<\_ACEOF
+#define P_VIDEO 1
+_ACEOF
+
+ HAS_VIDEO=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_VIDEO=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+if test "x${HAS_VIDEO}" != "x1" ; then
+
+cat >>confdefs.h <<\_ACEOF
#define NO_VIDEO_CAPTURE
_ACEOF
-else
- cat >>confdefs.h <<\_ACEOF
-#define P_VIDEO 1
+fi
+
+
+
+ { echo "$as_me:$LINENO: checking enable video file support" >&5
+echo $ECHO_N "checking enable video file support... $ECHO_C" >&6; }
+ # Check whether --enable-vidfile was given.
+if test "${enable_vidfile+set}" = set; then
+ enableval=$enable_vidfile;
+ if test "x$enableval" = "xyes"; then
+ HAS_VIDFILE=1
+ else
+ HAS_VIDFILE=
+ fi
+
+fi
+
+
+ if test "xHAS_VIDEO" != "x"; then
+ if test "x$HAS_VIDEO" != "x1"; then
+ { echo "$as_me:$LINENO: vidfile support disabled due to disabled dependency HAS_VIDEO" >&5
+echo "$as_me: vidfile support disabled due to disabled dependency HAS_VIDEO" >&6;}
+ HAS_VIDFILE=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: vidfile support disabled due to disabled dependency " >&5
+echo "$as_me: vidfile support disabled due to disabled dependency " >&6;}
+ HAS_VIDFILE=
+ fi
+ fi
+
+
+ if test "x${HAS_VIDFILE}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_VIDFILE 1
_ACEOF
- HAS_VIDEO=1
+ HAS_VIDFILE=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_VIDFILE=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking enable application sharing support" >&5
+echo $ECHO_N "checking enable application sharing support... $ECHO_C" >&6; }
+ # Check whether --enable-appshare was given.
+if test "${enable_appshare+set}" = set; then
+ enableval=$enable_appshare;
+ if test "x$enableval" = "xyes"; then
+ HAS_APPSHARE=1
+ else
+ HAS_APPSHARE=
+ fi
+
fi
+ if test "xHAS_VIDEO" != "x"; then
+ if test "x$HAS_VIDEO" != "x1"; then
+ { echo "$as_me:$LINENO: appshare support disabled due to disabled dependency HAS_VIDEO" >&5
+echo "$as_me: appshare support disabled due to disabled dependency HAS_VIDEO" >&6;}
+ HAS_APPSHARE=
+ fi
+ fi
+
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: appshare support disabled due to disabled dependency " >&5
+echo "$as_me: appshare support disabled due to disabled dependency " >&6;}
+ HAS_APPSHARE=
+ fi
+ fi
+
+
+ if test "x${HAS_APPSHARE}" = "x1"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define P_APPSHARE 1
+_ACEOF
+
+ HAS_APPSHARE=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_APPSHARE=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
HAS_VIDEO_CAPTURE=
-if test "x$enable_video" != "xno" ; then
- if test "x$enable_plugins" = "xyes" ; then
+if test "x${HAS_VIDEO}" = "x1" ; then
+ if test "x${HAS_PLUGINS}" = "x1" ; then
HAS_VIDEO_CAPTURE=1
else
case "$target_os" in
@@ -12090,420 +13232,6 @@
-
-# Check whether --enable-asn was given.
-if test "${enable_asn+set}" = set; then
- enableval=$enable_asn;
-fi
-
-
-if test "${enable_asn}z" = "z" ; then
- enable_asn=$def...
[truncated message content] |
|
From: <ms3...@us...> - 2008-08-21 17:48:02
|
Revision: 20713
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20713&view=rev
Author: ms30002000
Date: 2008-08-21 17:48:11 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
Move architecture dependent checks swab and upad128 to where they belong
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-21 03:20:32 UTC (rev 20712)
+++ ptlib/trunk/configure 2008-08-21 17:48:11 UTC (rev 20713)
@@ -3314,6 +3314,8 @@
+
+
PTLIBDIR=`pwd`
@@ -3516,6 +3518,96 @@
#define P_PTHREADS 1
_ACEOF
+
+{ echo "$as_me:$LINENO: checking for swab" >&5
+echo $ECHO_N "checking for swab... $ECHO_C" >&6; }
+if test "${ac_cv_func_swab+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define swab to an innocuous variant, in case <limits.h> declares swab.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define swab innocuous_swab
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char swab (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef swab
+
+/* 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 swab ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_swab || defined __stub___swab
+choke me
+#endif
+
+int
+main ()
+{
+return swab ();
+ ;
+ 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_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_swab=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_swab=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5
+echo "${ECHO_T}$ac_cv_func_swab" >&6; }
+if test $ac_cv_func_swab = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SYSTEM_SWAB
+_ACEOF
+
+fi
+
;;
freebsd* ) OSTYPE=FreeBSD ;
@@ -3529,6 +3621,95 @@
#define P_PTHREADS 1
_ACEOF
+ { echo "$as_me:$LINENO: checking for swab" >&5
+echo $ECHO_N "checking for swab... $ECHO_C" >&6; }
+if test "${ac_cv_func_swab+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define swab to an innocuous variant, in case <limits.h> declares swab.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define swab innocuous_swab
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char swab (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef swab
+
+/* 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 swab ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_swab || defined __stub___swab
+choke me
+#endif
+
+int
+main ()
+{
+return swab ();
+ ;
+ 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_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_swab=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_swab=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5
+echo "${ECHO_T}$ac_cv_func_swab" >&6; }
+if test $ac_cv_func_swab = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SYSTEM_SWAB
+_ACEOF
+
+fi
+
;;
openbsd* ) OSTYPE=OpenBSD ;
@@ -3541,6 +3722,95 @@
#define P_PTHREADS 1
_ACEOF
+ { echo "$as_me:$LINENO: checking for swab" >&5
+echo $ECHO_N "checking for swab... $ECHO_C" >&6; }
+if test "${ac_cv_func_swab+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define swab to an innocuous variant, in case <limits.h> declares swab.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define swab innocuous_swab
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char swab (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef swab
+
+/* 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 swab ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_swab || defined __stub___swab
+choke me
+#endif
+
+int
+main ()
+{
+return swab ();
+ ;
+ 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_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_swab=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_swab=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5
+echo "${ECHO_T}$ac_cv_func_swab" >&6; }
+if test $ac_cv_func_swab = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SYSTEM_SWAB
+_ACEOF
+
+fi
+
;;
netbsd* ) OSTYPE=NetBSD ;
@@ -3553,6 +3823,95 @@
#define P_PTHREADS 1
_ACEOF
+ { echo "$as_me:$LINENO: checking for swab" >&5
+echo $ECHO_N "checking for swab... $ECHO_C" >&6; }
+if test "${ac_cv_func_swab+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define swab to an innocuous variant, in case <limits.h> declares swab.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define swab innocuous_swab
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char swab (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef swab
+
+/* 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 swab ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_swab || defined __stub___swab
+choke me
+#endif
+
+int
+main ()
+{
+return swab ();
+ ;
+ 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_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_swab=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_swab=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5
+echo "${ECHO_T}$ac_cv_func_swab" >&6; }
+if test $ac_cv_func_swab = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SYSTEM_SWAB
+_ACEOF
+
+fi
+
;;
solaris* | sunos* ) OSTYPE=solaris ;
@@ -3564,6 +3923,63 @@
#define P_PTHREADS 1
_ACEOF
+
+ ptlib_upad128=no
+
+ { echo "$as_me:$LINENO: checking for upad128_t" >&5
+echo $ECHO_N "checking for upad128_t... $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 <sys/types.h>
+int
+main ()
+{
+upad128_t upad; upad._q = 0.0;
+ ;
+ return 0;
+}
+_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_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ptlib_upad128=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ { echo "$as_me:$LINENO: result: ${ptlib_upad128}" >&5
+echo "${ECHO_T}${ptlib_upad128}" >&6; }
+
+ if test $ptlib_upad128 = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define P_HAS_UPAD128_T 1
+_ACEOF
+
+fi
+
+
;;
darwin* ) OSTYPE=Darwin ;
@@ -3581,17 +3997,284 @@
#define P_PTHREADS 1
_ACEOF
+ { echo "$as_me:$LINENO: checking for swab" >&5
+echo $ECHO_N "checking for swab... $ECHO_C" >&6; }
+if test "${ac_cv_func_swab+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define swab to an innocuous variant, in case <limits.h> declares swab.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define swab innocuous_swab
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char swab (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef swab
+
+/* 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 swab ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_swab || defined __stub___swab
+choke me
+#endif
+
+int
+main ()
+{
+return swab ();
+ ;
+ 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_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_swab=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_swab=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5
+echo "${ECHO_T}$ac_cv_func_swab" >&6; }
+if test $ac_cv_func_swab = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SYSTEM_SWAB
+_ACEOF
+
+fi
+
;;
beos*) OSTYPE=beos ;
OS_TAG="P_BEOS" ;
OSRELEASE=`uname -r` ;
STDCCFLAGS="$STDCCFLAGS -D__BEOS__"
+ { echo "$as_me:$LINENO: checking for swab" >&5
+echo $ECHO_N "checking for swab... $ECHO_C" >&6; }
+if test "${ac_cv_func_swab+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define swab to an innocuous variant, in case <limits.h> declares swab.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define swab innocuous_swab
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char swab (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef swab
+
+/* 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 swab ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_swab || defined __stub___swab
+choke me
+#endif
+
+int
+main ()
+{
+return swab ();
+ ;
+ 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_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_swab=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_swab=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5
+echo "${ECHO_T}$ac_cv_func_swab" >&6; }
+if test $ac_cv_func_swab = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SYSTEM_SWAB
+_ACEOF
+
+fi
+
;;
cygwin*) OSTYPE=cygwin ;
OS_TAG="P_CYGWIN" ;
OSRELEASE="`uname -r`";
+ { echo "$as_me:$LINENO: checking for swab" >&5
+echo $ECHO_N "checking for swab... $ECHO_C" >&6; }
+if test "${ac_cv_func_swab+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define swab to an innocuous variant, in case <limits.h> declares swab.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define swab innocuous_swab
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char swab (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef swab
+
+/* 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 swab ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_swab || defined __stub___swab
+choke me
+#endif
+
+int
+main ()
+{
+return swab ();
+ ;
+ 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_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_swab=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_swab=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5
+echo "${ECHO_T}$ac_cv_func_swab" >&6; }
+if test $ac_cv_func_swab = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SYSTEM_SWAB
+_ACEOF
+
+fi
+
;;
mingw*) OSTYPE=mingw ;
@@ -3602,11 +4285,189 @@
STDCCFLAGS="$STDCCFLAGS -mms-bitfields" ;
ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32 -liphlpapi -lole32" ;
NEEDS_PTHREADS=no ;
+ { echo "$as_me:$LINENO: checking for swab" >&5
+echo $ECHO_N "checking for swab... $ECHO_C" >&6; }
+if test "${ac_cv_func_swab+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define swab to an innocuous variant, in case <limits.h> declares swab.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define swab innocuous_swab
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char swab (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef swab
+
+/* 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 swab ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_swab || defined __stub___swab
+choke me
+#endif
+
+int
+main ()
+{
+return swab ();
+ ;
+ 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_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_swab=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_swab=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5
+echo "${ECHO_T}$ac_cv_func_swab" >&6; }
+if test $ac_cv_func_swab = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SYSTEM_SWAB
+_ACEOF
+
+fi
+
;;
* ) OSTYPE="$target_os" ;
OS_TAG="P_UNKNOWN_OS" ;
OSRELEASE="\"${OSTYPE}_`uname -r`\"" ;
+ { echo "$as_me:$LINENO: checking for swab" >&5
+echo $ECHO_N "checking for swab... $ECHO_C" >&6; }
+if test "${ac_cv_func_swab+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define swab to an innocuous variant, in case <limits.h> declares swab.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define swab innocuous_swab
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char swab (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef swab
+
+/* 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 swab ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_swab || defined __stub___swab
+choke me
+#endif
+
+int
+main ()
+{
+return swab ();
+ ;
+ 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_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_swab=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_swab=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5
+echo "${ECHO_T}$ac_cv_func_swab" >&6; }
+if test $ac_cv_func_swab = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SYSTEM_SWAB
+_ACEOF
+
+fi
+
{ echo "$as_me:$LINENO: WARNING: \"OS $target_os not recognized - proceed with caution!\"" >&5
echo "$as_me: WARNING: \"OS $target_os not recognized - proceed with caution!\"" >&2;} ;
;;
@@ -3787,8 +4648,7 @@
if test ${OSTYPE} != "Darwin" ; then
-
-ac_ext=cpp
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -4800,8 +5660,10 @@
if test 0 = 1 ; then
+ { { echo "$as_me:$LINENO: error: error" >&5
+echo "$as_me: error: error" >&2;}
+ { (exit 1); exit 1; }; }
-
{ echo "$as_me:$LINENO: checking if compiler accepts -ffunction-sections" >&5
echo $ECHO_N "checking if compiler accepts -ffunction-sections... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
@@ -6263,65 +7125,8 @@
-if test "${OSTYPE:-unknown}" = "solaris"; then
- { echo "$as_me:$LINENO: checking for upad128_t" >&5
-echo $ECHO_N "checking for upad128_t... $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 <sys/types.h>
-int
-main ()
-{
-upad128_t upad; upad._q = 0.0;
- ;
- return 0;
-}
-_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_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- has_upad128_t=y
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test ${has_upad128_t} == "y"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- cat >>confdefs.h <<\_ACEOF
-#define P_HAS_UPAD128_T 1
-_ACEOF
-
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- fi
-fi
-
-
-
if test ${OSTYPE} != Darwin ; then
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -6523,10 +7328,6 @@
HAS_PTHREADS=yes
ENDLDLIBS="$ENDLDLIBS -pthread"
STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread"
- elif test ${OSTYPE} = FreeBSD ; then
- HAS_PTHREADS=yes
- ENDLDLIBS="$ENDLDLIBS -pthread"
- STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread"
fi
fi
@@ -13559,104 +14360,7 @@
-if test "$OSTYPE" = "solaris" ; then
- USE_SYSTEM_SWAB=
-else
- { echo "$as_me:$LINENO: checking for swab" >&5
-echo $ECHO_N "checking for swab... $ECHO_C" >&6; }
-if test "${ac_cv_func_swab+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define swab to an innocuous variant, in case <limits.h> declares swab.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define swab innocuous_swab
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char swab (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef swab
-
-/* 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 swab ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_swab || defined __stub___swab
-choke me
-#endif
-
-int
-main ()
-{
-return swab ();
- ;
- 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_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_swab=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_swab=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5
-echo "${ECHO_T}$ac_cv_func_swab" >&6; }
-if test $ac_cv_func_swab = yes; then
- USE_SYSTEM_SWAB=1
-fi
-
-fi
-if test "x$ac_cv_func_swab" = "xyes" ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_SYSTEM_SWAB
-_ACEOF
-
-fi
-
-
# Check whether --enable-memcheck was given.
if test "${enable_memcheck+set}" = set; then
enableval=$enable_memcheck; memcheck=$enableval
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-21 03:20:32 UTC (rev 20712)
+++ ptlib/trunk/configure.ac 2008-08-21 17:48:11 UTC (rev 20713)
@@ -219,6 +219,24 @@
AS_IF([test AS_VAR_GET([ptlib_openssl_const]) = yes], [$1], [$2])[]
])
+dnl PTLIB_CHECK_UPAD128
+dnl Check for upad128_t (solaris only)
+dnl Arguments:
+dnl Return: $1 action if-found
+dnl $2 action if-not-found
+AC_DEFUN([PTLIB_CHECK_UPAD128],
+ [
+ ptlib_upad128=no
+
+ AC_MSG_CHECKING(for upad128_t)
+ AC_TRY_COMPILE([#include <sys/types.h>],
+ [upad128_t upad; upad._q = 0.0;],
+ [ptlib_upad128=yes])
+ AC_MSG_RESULT(${ptlib_upad128})
+
+ AS_IF([test AS_VAR_GET([ptlib_upad128]) = yes], [$1], [$2])[]
+ ])
+
dnl PTLIB_OPENSSL_AES
dnl Check for directX
dnl Arguments:
@@ -352,6 +370,7 @@
OS_TAG="P_LINUX" ;
need_pragma=yes ;
AC_DEFINE(P_PTHREADS, 1, "PThreads found")
+ AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
;;
freebsd* ) OSTYPE=FreeBSD ;
@@ -361,6 +380,7 @@
fi
need_pragma=yes ;
AC_DEFINE(P_PTHREADS, 1, "PThreads found")
+ AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
;;
openbsd* ) OSTYPE=OpenBSD ;
@@ -369,6 +389,7 @@
ENDLDLIBS="-lossaudio" ;
need_pragma=yes ;
AC_DEFINE(P_PTHREADS, 1, "PThreads found")
+ AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
;;
netbsd* ) OSTYPE=NetBSD ;
@@ -377,6 +398,7 @@
ENDLDLIBS="-lossaudio" ;
need_pragma=yes ;
AC_DEFINE(P_PTHREADS, 1, "PThreads found")
+ AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
;;
solaris* | sunos* ) OSTYPE=solaris ;
@@ -384,6 +406,9 @@
OSRELEASE=`uname -r | sed "s/5\.//g"` ;
need_pragma=yes ;
AC_DEFINE(P_PTHREADS, 1, "PThreads found")
+ dnl According to Andre Schulze <as...@rn...>
+ dnl Solaris swab should not be used
+ PTLIB_CHECK_UPAD128( [AC_DEFINE(P_HAS_UPAD128_T)] )
;;
darwin* ) OSTYPE=Darwin ;
@@ -397,17 +422,20 @@
EXPATDIR=/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6
fi
AC_DEFINE(P_PTHREADS, 1, "PThreads found")
+ AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
;;
beos*) OSTYPE=beos ;
OS_TAG="P_BEOS" ;
OSRELEASE=`uname -r` ;
STDCCFLAGS="$STDCCFLAGS -D__BEOS__"
+ AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
;;
cygwin*) OSTYPE=cygwin ;
OS_TAG="P_CYGWIN" ;
OSRELEASE="`uname -r`";
+ AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
;;
mingw*) OSTYPE=mingw ;
@@ -418,11 +446,13 @@
STDCCFLAGS="$STDCCFLAGS -mms-bitfields" ;
ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32 -liphlpapi -lole32" ;
NEEDS_PTHREADS=no ;
+ AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
;;
* ) OSTYPE="$target_os" ;
OS_TAG="P_UNKNOWN_OS" ;
OSRELEASE="\"${OSTYPE}_`uname -r`\"" ;
+ AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
AC_MSG_WARN("OS $target_os not recognized - proceed with caution!") ;
;;
esac
@@ -670,67 +700,6 @@
STDCXXFLAGS="$STDCCFLAGS -frtti"
fi
-GCSECTIONS=0
-
-dnl Remove --gc-sections as the linker crashes when linking
-dnl static executables with this option
-dnl AC_MSG_CHECKING(if linker accepts --gc-sections)
-dnl C_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]])
-dnl CXX $CFLAGS -Wl,--gc-sections conftest.cc > /dev/null 2>&1
-dnl if test $? = 0 ; then
-
-if test 0 = 1 ; then
-
- dnl AC_MSG_RESULT(yes)
-
- AC_MSG_CHECKING(if compiler accepts -ffunction-sections)
- AC_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]])
- $CXX $CFLAGS -ffunction-sections -c conftest.$ac_ext > /dev/null 2>&1
- if test $? = 0 ; then
- AC_MSG_RESULT(yes)
- STDCCFLAGS="$STDCCFLAGS -ffunction-sections"
- GCSECTIONS=1
- else
- AC_MSG_RESULT(no)
- fi
-
- dnl remove data-sections as not only does is case the linker to
- dnl crash on some platforms, but seems to be broken w.r.t
- dnl closure of templates with static member functions
- dnl see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=8249
- dnl
- dnl AC_MSG_CHECKING(if compiler accepts -fdata-sections)
- dnl AC_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]])
- dnl $CXX $CFLAGS -fdata-sections -c conftest.cc > /dev/null 2>&1
- dnl if test $? = 0 ; then
- dnl AC_MSG_RESULT(yes)
- dnl STDCCFLAGS="$STDCCFLAGS -fdata-sections"
- dnl GCSECTIONS=1
- dnl else
- dnl AC_MSG_RESULT(no)
- dnl fi
-
- dnl as much as this flag would help, there is no known linker
- dnl that can handle PTLib when it has been compiled with it
- dnl AC_MSG_CHECKING(if compiler accepts -fvtable-gc)
- dnl AC_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]])
- dnl $CXX $CFLAGS -fvtable-gc -c conftest.cc > /dev/null 2>&1
- dnl if test $? = 0 ; then
- dnl AC_MSG_RESULT(yes)
- dnl STDCCFLAGS="$STDCCFLAGS -fvtable-gc"
- dnl GCSECTIONS=1
- dnl else
- dnl AC_MSG_RESULT(no)
- dnl fi
-
- if test $GCSECTIONS = 1; then
- if test "${OSTYPE}" != "Darwin" ; then
- P_STATIC_LDFLAGS="$P_STATIC_LDFLAGS -Wl,--gc-sections"
- fi
- fi
-fi
-
-
AC_LANG_POP(C++)
dnl ########################################################################
@@ -1055,22 +1024,8 @@
fi
-dnl ########################################################################
-dnl check if upad128_t is defined (Solaris)
-if test "${OSTYPE:-unknown}" = "solaris"; then
- AC_MSG_CHECKING(for upad128_t)
- AC_TRY_COMPILE([#include <sys/types.h>],
- [upad128_t upad; upad._q = 0.0;], has_upad128_t=y)
- if test ${has_upad128_t} == "y"; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(P_HAS_UPAD128_T)
- else
- AC_MSG_RESULT(no)
- fi
-fi
-
dnl ########################################################################
dnl check for Unix semaphores
@@ -1123,10 +1078,6 @@
HAS_PTHREADS=yes
ENDLDLIBS="$ENDLDLIBS -pthread"
STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread"
- elif test ${OSTYPE} = FreeBSD ; then
- HAS_PTHREADS=yes
- ENDLDLIBS="$ENDLDLIBS -pthread"
- STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread"
fi
fi
@@ -2042,19 +1993,6 @@
dnl ########################################################################
-dnl check for various functions
-dnl According to Andre Schulze <as...@rn...>
-dnl Solaris swab should not be used
-if test "$OSTYPE" = "solaris" ; then
- USE_SYSTEM_SWAB=
-else
- AC_CHECK_FUNC(swab,USE_SYSTEM_SWAB=1)
-fi
-if test "x$ac_cv_func_swab" = "xyes" ; then
- AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()])
-fi
-
-dnl ########################################################################
dnl look for MEMORY_CHECK enabled.
AC_ARG_ENABLE(memcheck,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ms3...@us...> - 2008-08-21 17:53:15
|
Revision: 20714
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20714&view=rev
Author: ms30002000
Date: 2008-08-21 17:53:25 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
Move ptlib configure functions to a separate m4 file.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
Added Paths:
-----------
ptlib/trunk/ptlib.m4
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-21 17:48:11 UTC (rev 20713)
+++ ptlib/trunk/configure 2008-08-21 17:53:25 UTC (rev 20714)
@@ -3316,6 +3316,8 @@
+
+
PTLIBDIR=`pwd`
@@ -5656,40 +5658,6 @@
STDCXXFLAGS="$STDCCFLAGS -frtti"
fi
-GCSECTIONS=0
-
-
-if test 0 = 1 ; then
- { { echo "$as_me:$LINENO: error: error" >&5
-echo "$as_me: error: error" >&2;}
- { (exit 1); exit 1; }; }
-
- { echo "$as_me:$LINENO: checking if compiler accepts -ffunction-sections" >&5
-echo $ECHO_N "checking if compiler accepts -ffunction-sections... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-int main(int ac,char **av) { return 0; }
-_ACEOF
- $CXX $CFLAGS -ffunction-sections -c conftest.$ac_ext > /dev/null 2>&1
- if test $? = 0 ; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- STDCCFLAGS="$STDCCFLAGS -ffunction-sections"
- GCSECTIONS=1
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- fi
-
-
-
- if test $GCSECTIONS = 1; then
- if test "${OSTYPE}" != "Darwin" ; then
- P_STATIC_LDFLAGS="$P_STATIC_LDFLAGS -Wl,--gc-sections"
- fi
- fi
-fi
-
-
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-21 17:48:11 UTC (rev 20713)
+++ ptlib/trunk/configure.ac 2008-08-21 17:53:25 UTC (rev 20714)
@@ -11,296 +11,9 @@
AC_LANG(C++)
-dnl PTLIB_SIMPLE
-dnl Change a given variable according to arguments and subst and define it
-dnl Arguments: $1 name of configure option
-dnl $2 the variable to change, subst and define
-dnl $3 the configure argument description
-dnl $4 dependency variable #1
-dnl $5 dependency variable #2
-dnl Return: ${HAS_$2} The (possibly) changed variable
-AC_DEFUN([PTLIB_SIMPLE_OPTION],
- [
-dnl if test "x${HAS_$2}" = "x"; then
-dnl AC_MSG_ERROR([No default specified for HAS_$2, please correct configure.ac])
-dnl fi
- AC_MSG_CHECKING([$3])
- AC_ARG_ENABLE([$1],
- [AC_HELP_STRING([--enable-$1],[$3])],
- [
- if test "x$enableval" = "xyes"; then
- HAS_$2=1
- else
- HAS_$2=
- fi
- ])
+m4_include(ptlib.m4)
- if test "x$4" != "x"; then
- if test "x$$4" != "x1"; then
- AC_MSG_NOTICE([$1 support disabled due to disabled dependency $4])
- HAS_$2=
- fi
- fi
-
- if test "x$5" != "x"; then
- if test "x$$5" != "x1"; then
- AC_MSG_NOTICE([$1 support disabled due to disabled dependency $5])
- HAS_$2=
- fi
- fi
-
-
- if test "x${HAS_$2}" = "x1"; then
- AC_DEFINE([P_$2], [1], [$3])
- HAS_$2=1
- AC_MSG_RESULT([yes])
- else
- HAS_$2=
- AC_MSG_RESULT([no])
- fi
- AC_SUBST(HAS_$2)
-
-
- ])
-
-dnl PTLIB_FIND_DIRECTX
-dnl Check for directX
-dnl Arguments:
-dnl Return: $1 action if-found
-dnl $2 action if-not-found
-dnl $DIRECTX_INCLUDES
-dnl $DIRECTX_LIBS
-AC_DEFUN([PTLIB_FIND_DIRECTX],
- [
- ptlib_has_directx=yes
- DIRECTX_INCLUDES=
- DIRECTX_LIBS=
-
- AC_ARG_WITH([directx-includedir],
- AS_HELP_STRING([--with-directx-includedir=DIR],[Location of DirectX include files]),
- [with_directx_dir="$withval"],
- [with_directx_dir="include"]
- )
-
- AC_MSG_CHECKING(for DirectX includes in ${with_directx_dir})
- AC_MSG_RESULT()
-
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -I${with_directx_dir}"
- AC_LANG(C++)
-
- AC_CHECK_HEADERS([mingw_dshow_port.h], [], [ptlib_has_directx=no])
- AC_CHECK_HEADERS([control.h], [], [ptlib_has_directx=no])
- AC_CHECK_HEADERS([ddraw.h], [], [ptlib_has_directx=no])
- AC_CHECK_HEADERS([dshow.h], [], [ptlib_has_directx=no])
- AC_CHECK_HEADERS([dsound.h], [], [ptlib_has_directx=no])
- AC_CHECK_HEADERS([dxerr9.h], [], [ptlib_has_directx=no])
- AC_CHECK_HEADERS([ksuuids.h], [], [ptlib_has_directx=no])
- AC_CHECK_HEADERS([strmif.h], [], [ptlib_has_directx=no])
- AC_CHECK_HEADERS([uuids.h], [], [ptlib_has_directx=no])
- CPPFLAGS="$old_CPPFLAGS"
-
-
- if test "x${ptlib_has_directx}" = "xyes" ; then
- AC_MSG_CHECKING([for DirectX libraries])
- AC_MSG_RESULT()
- fi
-
- if test "x${ptlib_has_directx}" = "xyes" ; then
- DIRECTX_INCLUDES="-I${with_directx_dir}"
- DIRECTX_LIBS="-ldsound -ldxerr9 -ldxguid -lstrmiids -lole32 -luuid -loleaut32 -lquartz"
- fi
-
- AS_IF([test AS_VAR_GET([ptlib_has_directx]) = yes], [$1], [$2])[]
- ])
-
-dnl PTLIB_FIND_RESOLVER
-dnl Check for dns resolver
-dnl Arguments:
-dnl Return: $1 action if-found
-dnl $2 action if-not-found
-dnl $RESOLVER_LIBS
-dnl $$HAS_RES_INIT
-AC_DEFUN([PTLIB_FIND_RESOLVER],
- [
- ptlib_has_resolver=no
- HAS_RES_NINIT=
-
- AC_CHECK_FUNC([res_ninit],
- [
- HAS_RES_NINIT=1
- ptlib_has_resolver=yes
- ])
-
- if test "x${ptlib_has_resolver}" = "xno" ; then
- AC_MSG_CHECKING([for res_ninit in -lresolv])
- old_LIBS="$LIBS"
- LIBS="$LIBS -lresolv"
- AC_LINK_IFELSE([[
- #include <netinet/in.h>
- #include <resolv.h>
- int main(int argc,char **argv) {
- res_state p; res_ninit(p);
- }
- ]],
- [
- HAS_RES_NINIT=1
- ptlib_has_resolver=yes
- RESOLVER_LIBS="-lresolv"
- ])
- LIBS="${old_LIBS}"
- AC_MSG_RESULT(${ptlib_has_resolver})
- fi
-
- if test "x${ptlib_has_resolver}" = "xno" ; then
- AC_CHECK_FUNC([res_search], [ptlib_has_resolver=yes])
- fi
-
- if test "x${ptlib_has_resolver}" = "xno" ; then
- AC_MSG_CHECKING([for res_search in -lresolv])
- old_LIBS="$LIBS"
- LIBS="$LIBS -lresolv"
- AC_LINK_IFELSE([[
- #include <netinet/in.h>
- #include <resolv.h>
- int main(int argc,char **argv){
- res_search (NULL, 0, 0, NULL, 0);
- }
- ]],
- [
- ptlib_has_resolver=yes
- RESOLVER_LIBS="-lresolv"
- ])
- LIBS="${old_LIBS}"
- AC_MSG_RESULT(${ptlib_has_resolver})
- fi
-
- if test "x${ptlib_has_resolver}" = "xno" ; then
- AC_SEARCH_LIBS([__res_search], [resolv], [ptlib_has_resolver=yes])
- fi
-
- if test "x${ptlib_has_resolver}" = "xno" ; then
- AC_SEARCH_LIBS([__res_search], [resolv], [ptlib_has_resolver=yes])
- fi
-
- if test "x${ptlib_has_resolver}" = "xno" ; then
- AC_CHECK_HEADERS([windns.h],
- [
- ptlib_has_resolver=yes
- RESOLVER_LIBS="-ldnsapi"
- ])
- fi
- AS_IF([test AS_VAR_GET([ptlib_has_resolver]) = yes], [$1], [$2])[]
- ])
-
-dnl PTLIB_OPENSSL_CONST
-dnl Check for directX
-dnl Arguments:
-dnl Return: $1 action if-found
-dnl $2 action if-not-found
-AC_DEFUN([PTLIB_OPENSSL_CONST],
- [
- ptlib_openssl_const=no
- old_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
- AC_LANG(C)
- AC_MSG_CHECKING(for const arg to d2i_AutoPrivateKey)
- AC_TRY_COMPILE([#include <openssl/evp.h>],
- [
- EVP_PKEY **a; const unsigned char **p; long l;
- d2i_AutoPrivateKey(a, p, l);
- ],
- [ptlib_openssl_const=yes]
- )
- AC_MSG_RESULT(${ptlib_openssl_const})
- AC_LANG(C++)
- CFLAGS="${old_CFLAGS}"
-
- AS_IF([test AS_VAR_GET([ptlib_openssl_const]) = yes], [$1], [$2])[]
- ])
-
-dnl PTLIB_CHECK_UPAD128
-dnl Check for upad128_t (solaris only)
-dnl Arguments:
-dnl Return: $1 action if-found
-dnl $2 action if-not-found
-AC_DEFUN([PTLIB_CHECK_UPAD128],
- [
- ptlib_upad128=no
-
- AC_MSG_CHECKING(for upad128_t)
- AC_TRY_COMPILE([#include <sys/types.h>],
- [upad128_t upad; upad._q = 0.0;],
- [ptlib_upad128=yes])
- AC_MSG_RESULT(${ptlib_upad128})
-
- AS_IF([test AS_VAR_GET([ptlib_upad128]) = yes], [$1], [$2])[]
- ])
-
-dnl PTLIB_OPENSSL_AES
-dnl Check for directX
-dnl Arguments:
-dnl Return: $1 action if-found
-dnl $2 action if-not-found
-AC_DEFUN([PTLIB_OPENSSL_AES],
- [
- ptlib_openssl_aes=no
- old_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
- AC_LANG(C)
- AC_CHECK_HEADERS([openssl/aes.h], [ptlib_openssl_aes=yes])
- AC_LANG(C++)
- CFLAGS="${old_CFLAGS}"
- AS_IF([test AS_VAR_GET([ptlib_openssl_aes]) = yes], [$1], [$2])[]
- ])
-
dnl ########################################################################
-dnl libdl
-dnl ########################################################################
-
-dnl PTLIB_FIND_LBDL
-dnl Try to find a library containing dlopen()
-dnl Arguments: $1 action if-found
-dnl $2 action if-not-found
-dnl Return: $DL_LIBS The libs for dlopen()
-AC_DEFUN([PTLIB_FIND_LIBDL],
- [
- ptlib_libdl=no
- AC_CHECK_HEADERS([dlfcn.h], [ptlib_dlfcn=yes], [ptlib_dlfcn=no])
- if test "$ptlib_dlfcn" = yes ; then
- AC_MSG_CHECKING(if dlopen is available)
- AC_LANG(C)
- AC_TRY_COMPILE([#include <dlfcn.h>],
- [void * p = dlopen("lib", 0);], [ptlib_dlopen=yes], [ptlib_dlopen=no])
- if test "$ptlib_dlopen" = no ; then
- AC_MSG_RESULT(no)
- else
- AC_MSG_RESULT(yes)
- case "$target_os" in
- freebsd*|openbsd*|netbsd*|darwin*|beos*)
- AC_CHECK_LIB([c],[dlopen],
- [
- ptlib_libdl=yes
- DL_LIBS="-lc"
- ],
- [ptlib_libdl=no])
- ;;
- *)
- AC_CHECK_LIB([dl],[dlopen],
- [
- ptlib_libdl=yes
- DL_LIBS="-ldl"
- ],
- [ptlib_libdl=no])
- ;;
- esac
- fi
- fi
- AS_IF([test AS_VAR_GET([ptlib_libdl]) = yes], [$1], [$2])[]
- ])
-
-
-dnl ########################################################################
dnl set the PTLIB directory to the current directory
PTLIBDIR=`pwd`
Added: ptlib/trunk/ptlib.m4
===================================================================
--- ptlib/trunk/ptlib.m4 (rev 0)
+++ ptlib/trunk/ptlib.m4 2008-08-21 17:53:25 UTC (rev 20714)
@@ -0,0 +1,289 @@
+dnl PTLIB_SIMPLE
+dnl Change a given variable according to arguments and subst and define it
+dnl Arguments: $1 name of configure option
+dnl $2 the variable to change, subst and define
+dnl $3 the configure argument description
+dnl $4 dependency variable #1
+dnl $5 dependency variable #2
+dnl Return: ${HAS_$2} The (possibly) changed variable
+AC_DEFUN([PTLIB_SIMPLE_OPTION],
+ [
+dnl if test "x${HAS_$2}" = "x"; then
+dnl AC_MSG_ERROR([No default specified for HAS_$2, please correct configure.ac])
+dnl fi
+ AC_MSG_CHECKING([$3])
+ AC_ARG_ENABLE([$1],
+ [AC_HELP_STRING([--enable-$1],[$3])],
+ [
+ if test "x$enableval" = "xyes"; then
+ HAS_$2=1
+ else
+ HAS_$2=
+ fi
+ ])
+
+ if test "x$4" != "x"; then
+ if test "x$$4" != "x1"; then
+ AC_MSG_NOTICE([$1 support disabled due to disabled dependency $4])
+ HAS_$2=
+ fi
+ fi
+
+ if test "x$5" != "x"; then
+ if test "x$$5" != "x1"; then
+ AC_MSG_NOTICE([$1 support disabled due to disabled dependency $5])
+ HAS_$2=
+ fi
+ fi
+
+
+ if test "x${HAS_$2}" = "x1"; then
+ AC_DEFINE([P_$2], [1], [$3])
+ HAS_$2=1
+ AC_MSG_RESULT([yes])
+ else
+ HAS_$2=
+ AC_MSG_RESULT([no])
+ fi
+ AC_SUBST(HAS_$2)
+
+
+ ])
+
+dnl PTLIB_FIND_DIRECTX
+dnl Check for directX
+dnl Arguments:
+dnl Return: $1 action if-found
+dnl $2 action if-not-found
+dnl $DIRECTX_INCLUDES
+dnl $DIRECTX_LIBS
+AC_DEFUN([PTLIB_FIND_DIRECTX],
+ [
+ ptlib_has_directx=yes
+ DIRECTX_INCLUDES=
+ DIRECTX_LIBS=
+
+ AC_ARG_WITH([directx-includedir],
+ AS_HELP_STRING([--with-directx-includedir=DIR],[Location of DirectX include files]),
+ [with_directx_dir="$withval"],
+ [with_directx_dir="include"]
+ )
+
+ AC_MSG_CHECKING(for DirectX includes in ${with_directx_dir})
+ AC_MSG_RESULT()
+
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -I${with_directx_dir}"
+ AC_LANG(C++)
+
+ AC_CHECK_HEADERS([mingw_dshow_port.h], [], [ptlib_has_directx=no])
+ AC_CHECK_HEADERS([control.h], [], [ptlib_has_directx=no])
+ AC_CHECK_HEADERS([ddraw.h], [], [ptlib_has_directx=no])
+ AC_CHECK_HEADERS([dshow.h], [], [ptlib_has_directx=no])
+ AC_CHECK_HEADERS([dsound.h], [], [ptlib_has_directx=no])
+ AC_CHECK_HEADERS([dxerr9.h], [], [ptlib_has_directx=no])
+ AC_CHECK_HEADERS([ksuuids.h], [], [ptlib_has_directx=no])
+ AC_CHECK_HEADERS([strmif.h], [], [ptlib_has_directx=no])
+ AC_CHECK_HEADERS([uuids.h], [], [ptlib_has_directx=no])
+ CPPFLAGS="$old_CPPFLAGS"
+
+
+ if test "x${ptlib_has_directx}" = "xyes" ; then
+ AC_MSG_CHECKING([for DirectX libraries])
+ AC_MSG_RESULT()
+ fi
+
+ if test "x${ptlib_has_directx}" = "xyes" ; then
+ DIRECTX_INCLUDES="-I${with_directx_dir}"
+ DIRECTX_LIBS="-ldsound -ldxerr9 -ldxguid -lstrmiids -lole32 -luuid -loleaut32 -lquartz"
+ fi
+
+ AS_IF([test AS_VAR_GET([ptlib_has_directx]) = yes], [$1], [$2])[]
+ ])
+
+dnl PTLIB_FIND_RESOLVER
+dnl Check for dns resolver
+dnl Arguments:
+dnl Return: $1 action if-found
+dnl $2 action if-not-found
+dnl $RESOLVER_LIBS
+dnl $$HAS_RES_INIT
+AC_DEFUN([PTLIB_FIND_RESOLVER],
+ [
+ ptlib_has_resolver=no
+ HAS_RES_NINIT=
+
+ AC_CHECK_FUNC([res_ninit],
+ [
+ HAS_RES_NINIT=1
+ ptlib_has_resolver=yes
+ ])
+
+ if test "x${ptlib_has_resolver}" = "xno" ; then
+ AC_MSG_CHECKING([for res_ninit in -lresolv])
+ old_LIBS="$LIBS"
+ LIBS="$LIBS -lresolv"
+ AC_LINK_IFELSE([[
+ #include <netinet/in.h>
+ #include <resolv.h>
+ int main(int argc,char **argv) {
+ res_state p; res_ninit(p);
+ }
+ ]],
+ [
+ HAS_RES_NINIT=1
+ ptlib_has_resolver=yes
+ RESOLVER_LIBS="-lresolv"
+ ])
+ LIBS="${old_LIBS}"
+ AC_MSG_RESULT(${ptlib_has_resolver})
+ fi
+
+ if test "x${ptlib_has_resolver}" = "xno" ; then
+ AC_CHECK_FUNC([res_search], [ptlib_has_resolver=yes])
+ fi
+
+ if test "x${ptlib_has_resolver}" = "xno" ; then
+ AC_MSG_CHECKING([for res_search in -lresolv])
+ old_LIBS="$LIBS"
+ LIBS="$LIBS -lresolv"
+ AC_LINK_IFELSE([[
+ #include <netinet/in.h>
+ #include <resolv.h>
+ int main(int argc,char **argv){
+ res_search (NULL, 0, 0, NULL, 0);
+ }
+ ]],
+ [
+ ptlib_has_resolver=yes
+ RESOLVER_LIBS="-lresolv"
+ ])
+ LIBS="${old_LIBS}"
+ AC_MSG_RESULT(${ptlib_has_resolver})
+ fi
+
+ if test "x${ptlib_has_resolver}" = "xno" ; then
+ AC_SEARCH_LIBS([__res_search], [resolv], [ptlib_has_resolver=yes])
+ fi
+
+ if test "x${ptlib_has_resolver}" = "xno" ; then
+ AC_SEARCH_LIBS([__res_search], [resolv], [ptlib_has_resolver=yes])
+ fi
+
+ if test "x${ptlib_has_resolver}" = "xno" ; then
+ AC_CHECK_HEADERS([windns.h],
+ [
+ ptlib_has_resolver=yes
+ RESOLVER_LIBS="-ldnsapi"
+ ])
+ fi
+ AS_IF([test AS_VAR_GET([ptlib_has_resolver]) = yes], [$1], [$2])[]
+ ])
+
+dnl PTLIB_OPENSSL_CONST
+dnl Check for directX
+dnl Arguments:
+dnl Return: $1 action if-found
+dnl $2 action if-not-found
+AC_DEFUN([PTLIB_OPENSSL_CONST],
+ [
+ ptlib_openssl_const=no
+ old_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+ AC_LANG(C)
+ AC_MSG_CHECKING(for const arg to d2i_AutoPrivateKey)
+ AC_TRY_COMPILE([#include <openssl/evp.h>],
+ [
+ EVP_PKEY **a; const unsigned char **p; long l;
+ d2i_AutoPrivateKey(a, p, l);
+ ],
+ [ptlib_openssl_const=yes]
+ )
+ AC_MSG_RESULT(${ptlib_openssl_const})
+ AC_LANG(C++)
+ CFLAGS="${old_CFLAGS}"
+
+ AS_IF([test AS_VAR_GET([ptlib_openssl_const]) = yes], [$1], [$2])[]
+ ])
+
+dnl PTLIB_CHECK_UPAD128
+dnl Check for upad128_t (solaris only)
+dnl Arguments:
+dnl Return: $1 action if-found
+dnl $2 action if-not-found
+AC_DEFUN([PTLIB_CHECK_UPAD128],
+ [
+ ptlib_upad128=no
+
+ AC_MSG_CHECKING(for upad128_t)
+ AC_TRY_COMPILE([#include <sys/types.h>],
+ [upad128_t upad; upad._q = 0.0;],
+ [ptlib_upad128=yes])
+ AC_MSG_RESULT(${ptlib_upad128})
+
+ AS_IF([test AS_VAR_GET([ptlib_upad128]) = yes], [$1], [$2])[]
+ ])
+
+dnl PTLIB_OPENSSL_AES
+dnl Check for directX
+dnl Arguments:
+dnl Return: $1 action if-found
+dnl $2 action if-not-found
+AC_DEFUN([PTLIB_OPENSSL_AES],
+ [
+ ptlib_openssl_aes=no
+ old_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+ AC_LANG(C)
+ AC_CHECK_HEADERS([openssl/aes.h], [ptlib_openssl_aes=yes])
+ AC_LANG(C++)
+ CFLAGS="${old_CFLAGS}"
+ AS_IF([test AS_VAR_GET([ptlib_openssl_aes]) = yes], [$1], [$2])[]
+ ])
+
+dnl ########################################################################
+dnl libdl
+dnl ########################################################################
+
+dnl PTLIB_FIND_LBDL
+dnl Try to find a library containing dlopen()
+dnl Arguments: $1 action if-found
+dnl $2 action if-not-found
+dnl Return: $DL_LIBS The libs for dlopen()
+AC_DEFUN([PTLIB_FIND_LIBDL],
+ [
+ ptlib_libdl=no
+ AC_CHECK_HEADERS([dlfcn.h], [ptlib_dlfcn=yes], [ptlib_dlfcn=no])
+ if test "$ptlib_dlfcn" = yes ; then
+ AC_MSG_CHECKING(if dlopen is available)
+ AC_LANG(C)
+ AC_TRY_COMPILE([#include <dlfcn.h>],
+ [void * p = dlopen("lib", 0);], [ptlib_dlopen=yes], [ptlib_dlopen=no])
+ if test "$ptlib_dlopen" = no ; then
+ AC_MSG_RESULT(no)
+ else
+ AC_MSG_RESULT(yes)
+ case "$target_os" in
+ freebsd*|openbsd*|netbsd*|darwin*|beos*)
+ AC_CHECK_LIB([c],[dlopen],
+ [
+ ptlib_libdl=yes
+ DL_LIBS="-lc"
+ ],
+ [ptlib_libdl=no])
+ ;;
+ *)
+ AC_CHECK_LIB([dl],[dlopen],
+ [
+ ptlib_libdl=yes
+ DL_LIBS="-ldl"
+ ],
+ [ptlib_libdl=no])
+ ;;
+ esac
+ fi
+ fi
+ AS_IF([test AS_VAR_GET([ptlib_libdl]) = yes], [$1], [$2])[]
+ ])
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ms3...@us...> - 2008-08-21 18:17:29
|
Revision: 20715
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20715&view=rev
Author: ms30002000
Date: 2008-08-21 18:17:37 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
Move FDSIZE check of solaris to arch-dependent section.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
ptlib/trunk/ptlib.m4
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-21 17:53:25 UTC (rev 20714)
+++ ptlib/trunk/configure 2008-08-21 18:17:37 UTC (rev 20715)
@@ -3318,6 +3318,10 @@
+
+
+
+
PTLIBDIR=`pwd`
@@ -3982,6 +3986,26 @@
fi
+
+ ptlib_fdsize_file=/etc/system
+ ptlib_fdsize=`cat ${ptlib_fdsize_file} | grep rlim_fd_max | cut -c1`
+
+ if test "x${ptlib_fdsize}" = "x#"; then
+ ptlib_fdsize=4098
+ else
+ ptlib_fdsize=`cat ${ptlib_fdsize_file} | grep rlim_fd_max | cut -f2 -d'='`
+ if test "x${ptlib_fdsize}" = "x"; then
+ ptlib_fdsize=4098
+ fi
+ fi
+
+ if test "x${ptlib_fdsize}" != "x4098"; then
+ STDCCFLAGS="$STDCCFLAGS -DFD_SETSIZE=${ptlib_fdsize}"
+ fi
+
+ { echo "$as_me:$LINENO: result: ${ptlib_fdsize}" >&5
+echo "${ECHO_T}${ptlib_fdsize}" >&6; }
+
;;
darwin* ) OSTYPE=Darwin ;
@@ -7071,30 +7095,6 @@
-
-if test "${OSTYPE:-unknown}" = "solaris"; then
- { echo "$as_me:$LINENO: checking checking for FD_SETSIZE" >&5
-echo $ECHO_N "checking checking for FD_SETSIZE... $ECHO_C" >&6; }
- _FD_SYSTEM_FILE=/etc/system
- _FD_SETSIZE=`cat $_FD_SYSTEM_FILE | grep rlim_fd_max | cut -c1`
- if test "$_FD_SETSIZE" = "#"; then
- _FD_SETSIZE=4098
- else
- _FD_SETSIZE=`cat $_FD_SYSTEM_FILE | grep rlim_fd_max | cut -f2 -d'='`
- if test "x$_FD_SETSIZE" = "x"; then
- _FD_SETSIZE=4098
- else
- STDCCFLAGS="$STDCCFLAGS -DFD_SETSIZE=$_FD_SETSIZE"
- fi
- fi
- { echo "$as_me:$LINENO: result: $_FD_SETSIZE" >&5
-echo "${ECHO_T}$_FD_SETSIZE" >&6; }
-fi
-
-
-
-
-
if test ${OSTYPE} != Darwin ; then
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-21 17:53:25 UTC (rev 20714)
+++ ptlib/trunk/configure.ac 2008-08-21 18:17:37 UTC (rev 20715)
@@ -122,6 +122,7 @@
dnl According to Andre Schulze <as...@rn...>
dnl Solaris swab should not be used
PTLIB_CHECK_UPAD128( [AC_DEFINE(P_HAS_UPAD128_T)] )
+ PTLIB_CHECK_FDSIZE()
;;
darwin* ) OSTYPE=Darwin ;
@@ -715,31 +716,7 @@
AC_DEFINE_UNQUOTED(P_HAS_ATOMIC_INT, ${P_HAS_ATOMIC_INT})
AC_DEFINE_UNQUOTED(P_NEEDS_GNU_CXX_NAMESPACE, ${P_NEEDS_GNU_CXX_NAMESPACE})
-
dnl ########################################################################
-dnl check for select_large_fdset (Solaris)
-
-if test "${OSTYPE:-unknown}" = "solaris"; then
- AC_MSG_CHECKING(checking for FD_SETSIZE)
- _FD_SYSTEM_FILE=/etc/system
- _FD_SETSIZE=`cat $_FD_SYSTEM_FILE | grep rlim_fd_max | cut -c1`
- if test "$_FD_SETSIZE" = "#"; then
- _FD_SETSIZE=4098
- else
- _FD_SETSIZE=`cat $_FD_SYSTEM_FILE | grep rlim_fd_max | cut -f2 -d'='`
- if test "x$_FD_SETSIZE" = "x"; then
- _FD_SETSIZE=4098
- else
- STDCCFLAGS="$STDCCFLAGS -DFD_SETSIZE=$_FD_SETSIZE"
- fi
- fi
- AC_MSG_RESULT($_FD_SETSIZE)
-fi
-
-
-
-
-dnl ########################################################################
dnl check for Unix semaphores
dnl posix unnamed semaphore support in darwin/macosx is broken
Modified: ptlib/trunk/ptlib.m4
===================================================================
--- ptlib/trunk/ptlib.m4 2008-08-21 17:53:25 UTC (rev 20714)
+++ ptlib/trunk/ptlib.m4 2008-08-21 18:17:37 UTC (rev 20715)
@@ -287,3 +287,45 @@
])
+dnl PTLIB_OPENSSL_AES
+dnl Check for directX
+dnl Arguments:
+dnl Return: $1 action if-found
+dnl $2 action if-not-found
+AC_DEFUN([PTLIB_OPENSSL_AES],
+ [
+ ptlib_openssl_aes=no
+ old_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+ AC_LANG(C)
+ AC_CHECK_HEADERS([openssl/aes.h], [ptlib_openssl_aes=yes])
+ AC_LANG(C++)
+ CFLAGS="${old_CFLAGS}"
+ AS_IF([test AS_VAR_GET([ptlib_openssl_aes]) = yes], [$1], [$2])[]
+ ])
+
+dnl PTLIB_CHECK_FDSIZE
+dnl check for select_large_fdset (Solaris)
+dnl Arguments: $STDCCFLAGS
+dnl Return: $STDCCFLAGS
+AC_DEFUN([PTLIB_CHECK_FDSIZE],
+ [
+ ptlib_fdsize_file=/etc/system
+ ptlib_fdsize=`cat ${ptlib_fdsize_file} | grep rlim_fd_max | cut -c1`
+
+ if test "x${ptlib_fdsize}" = "x#"; then
+ ptlib_fdsize=4098
+ else
+ ptlib_fdsize=`cat ${ptlib_fdsize_file} | grep rlim_fd_max | cut -f2 -d'='`
+ if test "x${ptlib_fdsize}" = "x"; then
+ ptlib_fdsize=4098
+ fi
+ fi
+
+ if test "x${ptlib_fdsize}" != "x4098"; then
+ STDCCFLAGS="$STDCCFLAGS -DFD_SETSIZE=${ptlib_fdsize}"
+ fi
+
+ AC_MSG_RESULT(${ptlib_fdsize})
+ ])
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ms3...@us...> - 2008-08-22 18:21:07
|
Revision: 20725
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20725&view=rev
Author: ms30002000
Date: 2008-08-22 18:21:16 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Adapted P_QOS option.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
ptlib/trunk/include/ptbuildopts.h.in
ptlib/trunk/include/ptlib/ipsock.h
ptlib/trunk/include/ptlib/qos.h
ptlib/trunk/include/ptlib/udpsock.h
ptlib/trunk/src/ptlib/common/sockets.cxx
ptlib/trunk/src/ptlib/msos/winsock.cxx
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/configure 2008-08-22 18:21:16 UTC (rev 20725)
@@ -738,6 +738,7 @@
HAS_POP3SMTP
HAS_SOCKAGG
HAS_AUDIO
+HAS_QOS
HAS_VIDEO
HAS_VIDFILE
HAS_APPSHARE
@@ -1389,7 +1390,7 @@
--enable-pop3smtp enable POP3/SMTP support
--enable-sockagg enable socket aggregation
--enable-audio enable audio support
- --disable-qos disable QOS support
+ --enable-qos enable QOS support
--enable-video enable video device support
--enable-vidfile enable video file support
--enable-appshare enable application sharing support
@@ -6640,7 +6641,7 @@
default_alsa=yes
default_oss=yes
default_ipv6=yes
-default_qos=yes
+HAS_QOS=1
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
@@ -6681,7 +6682,7 @@
default_alsa=yes
default_oss=yes
default_ipv6=yes
- default_qos=yes
+ HAS_QOS=1
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
@@ -6721,7 +6722,7 @@
default_alsa=yes
default_oss=no
default_ipv6=no
- default_qos=no
+ HAS_QOS=
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
@@ -12274,26 +12275,59 @@
-# Check whether --enable-qos was given.
+
+ { echo "$as_me:$LINENO: checking enable QOS support" >&5
+echo $ECHO_N "checking enable QOS support... $ECHO_C" >&6; }
+ # Check whether --enable-qos was given.
if test "${enable_qos+set}" = set; then
enableval=$enable_qos;
+ if test "x$enableval" = "xyes"; then
+ HAS_QOS=1
+ else
+ HAS_QOS=
+ fi
+
fi
-if test "${enable_qos}z" = "z" ; then
- enable_qos=$default_qos
-fi
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: qos support disabled due to disabled dependency " >&5
+echo "$as_me: qos support disabled due to disabled dependency " >&6;}
+ HAS_QOS=
+ fi
+ fi
-if test "$enable_qos" != "no" ; then
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: qos support disabled due to disabled dependency " >&5
+echo "$as_me: qos support disabled due to disabled dependency " >&6;}
+ HAS_QOS=
+ fi
+ fi
+
+ if test "x${HAS_QOS}" = "x1"; then
+
cat >>confdefs.h <<\_ACEOF
-#define P_HAS_QOS 1
+#define P_QOS 1
_ACEOF
-fi
+ HAS_QOS=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_QOS=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
{ echo "$as_me:$LINENO: checking enable video device support" >&5
echo $ECHO_N "checking enable video device support... $ECHO_C" >&6; }
# Check whether --enable-video was given.
@@ -15541,6 +15575,7 @@
HAS_POP3SMTP!$HAS_POP3SMTP$ac_delim
HAS_SOCKAGG!$HAS_SOCKAGG$ac_delim
HAS_AUDIO!$HAS_AUDIO$ac_delim
+HAS_QOS!$HAS_QOS$ac_delim
HAS_VIDEO!$HAS_VIDEO$ac_delim
HAS_VIDFILE!$HAS_VIDFILE$ac_delim
HAS_APPSHARE!$HAS_APPSHARE$ac_delim
@@ -15561,7 +15596,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/configure.ac 2008-08-22 18:21:16 UTC (rev 20725)
@@ -520,7 +520,7 @@
default_alsa=yes
default_oss=yes
default_ipv6=yes
-default_qos=yes
+HAS_QOS=1
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
@@ -561,7 +561,7 @@
default_alsa=yes
default_oss=yes
default_ipv6=yes
- default_qos=yes
+ HAS_QOS=1
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
@@ -601,7 +601,7 @@
default_alsa=yes
default_oss=no
default_ipv6=no
- default_qos=no
+ HAS_QOS=
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
@@ -1488,7 +1488,7 @@
dnl look for QoS functions
dnl MSWIN_DISPLAY qos,QoS Support
-dnl MSWIN_CHECK_FILE qos,qossp.h|QOS_DESTADDR,P_HAS_QOS=1
+dnl MSWIN_CHECK_FILE qos,qossp.h|QOS_DESTADDR,P_QOS=1
dnl MSWIN_DIR_SYMBOL qos,QOS_DIR
dnl MSWIN_CHECK_DIR qos,\Program Files\Microsoft Visual Studio 8\VC\PlatformSDK\Include\
dnl MSWIN_CHECK_DIR qos,\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\Include\
@@ -1496,17 +1496,8 @@
dnl MSWIN_CHECK_DIR qos,\Program Files\Microsoft SDK\include\
dnl MSWIN_CHECK_DIR qos,\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include\
-AC_ARG_ENABLE(qos,
- [ --disable-qos disable QOS support])
+PTLIB_SIMPLE_OPTION([qos], [QOS], [enable QOS support])
-if test "${enable_qos}z" = "z" ; then
- enable_qos=$default_qos
-fi
-
-if test "$enable_qos" != "no" ; then
- AC_DEFINE([P_HAS_QOS], [1], [Have QOS])
-fi
-
dnl ########################################################################
dnl check for video support
dnl MSWIN_DISPLAY video,Video Support
Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/include/ptbuildopts.h.in 2008-08-22 18:21:16 UTC (rev 20725)
@@ -96,10 +96,10 @@
//
#ifndef _WIN32_WCE
-#undef P_HAS_QOS
+#undef P_QOS
#endif // _WIN32_WCE
-#if defined(_MSC_VER) && P_HAS_QOS
+#if defined(_MSC_VER) && P_QOS
#pragma include_alias(<qossp.h>, <@QOS_DIR@/qossp.h>)
Modified: ptlib/trunk/include/ptlib/ipsock.h
===================================================================
--- ptlib/trunk/include/ptlib/ipsock.h 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/include/ptlib/ipsock.h 2008-08-22 18:21:16 UTC (rev 20725)
@@ -40,13 +40,13 @@
#include <ptlib/socket.h>
-#ifdef P_HAS_QOS
+#if P_QOS
#ifdef _WIN32
#ifdef P_KNOCKOUT_WINSOCK2
#include "IPExport.h"
#endif // KNOCKOUT_WINSOCK2
#endif // _WIN32
-#endif // P_HAS_QOS
+#endif // P_QOS
/** This class describes a type of socket that will communicate using the
Internet Protocol.
Modified: ptlib/trunk/include/ptlib/qos.h
===================================================================
--- ptlib/trunk/include/ptlib/qos.h 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/include/ptlib/qos.h 2008-08-22 18:21:16 UTC (rev 20725)
@@ -29,7 +29,7 @@
#pragma interface
#endif
-#if P_HAS_QOS
+#if P_QOS
#ifdef _WIN32
#ifndef P_KNOCKOUT_WINSOCK2
#include <winsock2.h>
@@ -40,7 +40,7 @@
#endif // KNOCKOUT_QOS
#endif // KNOCKOUT_WINSOCK2
#endif // _WIN32
-#endif // P_HAS_QOS
+#endif // P_QOS
#ifndef QOS_NOT_SPECIFIED
#define QOS_NOT_SPECIFIED 0xFFFFFFFF
Modified: ptlib/trunk/include/ptlib/udpsock.h
===================================================================
--- ptlib/trunk/include/ptlib/udpsock.h 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/include/ptlib/udpsock.h 2008-08-22 18:21:16 UTC (rev 20725)
@@ -121,7 +121,7 @@
PQoS * qos ///< QoS specification to use
);
-#if P_HAS_QOS
+#if P_QOS
/** Get the QOS object for the socket.
*/
virtual PQoS & GetQoSSpec();
@@ -177,7 +177,7 @@
#endif
};
-#if P_HAS_QOS
+#if P_QOS
#ifdef _WIN32
#include <winbase.h>
@@ -201,7 +201,7 @@
#endif // _WIN32_WCE
#endif // _WIN32
-#endif // P_HAS_QOS
+#endif // P_QOS
#endif
Modified: ptlib/trunk/src/ptlib/common/sockets.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/sockets.cxx 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/src/ptlib/common/sockets.cxx 2008-08-22 18:21:16 UTC (rev 20725)
@@ -48,7 +48,7 @@
#include <ConfigurationClass.h>
#endif
-#if P_HAS_QOS
+#if P_QOS
#ifdef _WIN32
#include <winbase.h>
@@ -64,7 +64,7 @@
#endif // _WIN32_WCE
#endif // _WIN32
-#endif // P_HAS_QOS
+#endif // P_QOS
#if P_HAS_IPV6
@@ -2415,12 +2415,12 @@
return PTrue;
}
-#if P_HAS_QOS
+#if P_QOS
PQoS & PUDPSocket::GetQoSSpec()
{
return qosSpec;
}
-#endif
+#endif //P_QOS
PBoolean PUDPSocket::ApplyQoS()
{
@@ -2452,7 +2452,7 @@
DSCPval = (char)qosSpec.GetDSCP();
#ifdef _WIN32
-#if P_HAS_QOS
+#if P_QOS
if (disableGQoS)
return PFalse;
@@ -2501,7 +2501,7 @@
if (!usesetsockopt)
return retval;
-#endif // P_HAS_QOS
+#endif // P_QOS
#endif // _WIN32
unsigned int setDSCP = DSCPval<<2;
@@ -2536,7 +2536,7 @@
return ConvertOSError(os_handle = os_socket(af, type, proto));
#endif
-#if defined(_WIN32) && defined(P_HAS_QOS)
+#if defined(_WIN32) && defined(P_QOS)
DWORD bufferSize = 0;
DWORD numProtocols, i;
@@ -2603,7 +2603,7 @@
#ifdef _WIN32
#ifndef _WIN32_WCE
-#ifdef P_HAS_QOS
+#if P_QOS
#define COULD_HAVE_QOS
@@ -2622,9 +2622,9 @@
return PFalse;
}
-#endif
-#endif
-#endif
+#endif // P_QOS
+#endif // _WIN32_WCE
+#endif // _WIN32
PBoolean PUDPSocket::OpenSocket()
{
Modified: ptlib/trunk/src/ptlib/msos/winsock.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/winsock.cxx 2008-08-22 11:23:04 UTC (rev 20724)
+++ ptlib/trunk/src/ptlib/msos/winsock.cxx 2008-08-22 18:21:16 UTC (rev 20725)
@@ -602,7 +602,7 @@
disableGQoS = PFalse;
}
-#if P_HAS_QOS
+#if P_QOS
PBoolean PUDPSocket::SupportQoS(const PIPSocket::Address & address)
{
if (disableGQoS)
@@ -643,10 +643,10 @@
{
return PFalse;
}
-#endif // P_HAS_QOS
+#endif // P_QOS
-#if P_HAS_QOS
+#if P_QOS
#ifndef _WIN32_WCE
@@ -699,7 +699,7 @@
#endif // _WIN32_WCE
-#endif // P_HAS_QOS
+#endif // P_QOS
#ifndef _WIN32_WCE
//////////////////////////////////////////////////////////////////////////////
@@ -866,7 +866,7 @@
}
-#ifdef P_HAS_QOS
+#ifdef P_QOS
PBoolean PIPXSocket::GetHostAddress(const PString & /*hostname*/, Address & /*addr*/)
{
return PFalse;
@@ -898,7 +898,7 @@
AssignAddress(addr, *(sockaddr_ipx *)addr_info[0].RemoteAddr.lpSockaddr);
return PTrue;
}
-#endif
+#endif // P_QOS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ms3...@us...> - 2008-08-25 18:13:21
|
Revision: 20733
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20733&view=rev
Author: ms30002000
Date: 2008-08-25 18:13:25 +0000 (Mon, 25 Aug 2008)
Log Message:
-----------
Fix audio device compilation when compiling without plugins.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-24 09:56:55 UTC (rev 20732)
+++ ptlib/trunk/configure 2008-08-25 18:13:25 UTC (rev 20733)
@@ -6710,7 +6710,7 @@
HAS_SERIAL=
HAS_POP3SMTP=
HAS_AUDIO=1
- HAS_VIDEO=!
+ HAS_VIDEO=1
HAS_URL=1
HAS_HTTP=1
HAS_HTTPFORMS=
@@ -14037,7 +14037,7 @@
HAS_ALSA=
HAS_OSS=
-if test "$enable_audio" = "yes" ; then
+if test "x${HAS_AUDIO}" = "x1" ; then
# Check whether --enable-alsa was given.
if test "${enable_alsa+set}" = set; then
@@ -14050,7 +14050,7 @@
fi
- if test "$enable_plugins" = "no" ; then
+ if test "x${HAS_PLUGINS}" = "x" ; then
if test "${enable_alsa}z" = "z" ; then
enable_alsa=$default_alsa
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-24 09:56:55 UTC (rev 20732)
+++ ptlib/trunk/configure.ac 2008-08-25 18:13:25 UTC (rev 20733)
@@ -589,7 +589,7 @@
HAS_SERIAL=
HAS_POP3SMTP=
HAS_AUDIO=1
- HAS_VIDEO=!
+ HAS_VIDEO=1
HAS_URL=1
HAS_HTTP=1
HAS_HTTPFORMS=
@@ -1596,13 +1596,13 @@
HAS_ALSA=
HAS_OSS=
-if test "$enable_audio" = "yes" ; then
+if test "x${HAS_AUDIO}" = "x1" ; then
dnl these are needed to pass through to the plugin configure program
AC_ARG_ENABLE(alsa, [ --enable-alsa enable ALSA audio support],enable_alsa=$enableval)
AC_ARG_ENABLE(oss, [ --enable-oss enable OSS audio support],enable_oss=$enableval)
- if test "$enable_plugins" = "no" ; then
+ if test "x${HAS_PLUGINS}" = "x" ; then
if test "${enable_alsa}z" = "z" ; then
enable_alsa=$default_alsa
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dsa...@us...> - 2008-08-26 11:44:37
|
Revision: 20737
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20737&view=rev
Author: dsandras
Date: 2008-08-26 11:44:46 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
Added mkdir support thanks to Steve Frecinaux <frecinaux novacom be>
from NOVACOM.
Modified Paths:
--------------
ptlib/trunk/include/ptclib/ftp.h
ptlib/trunk/src/ptclib/ftpclnt.cxx
Modified: ptlib/trunk/include/ptclib/ftp.h
===================================================================
--- ptlib/trunk/include/ptclib/ftp.h 2008-08-25 20:14:24 UTC (rev 20736)
+++ ptlib/trunk/include/ptclib/ftp.h 2008-08-26 11:44:46 UTC (rev 20737)
@@ -180,6 +180,15 @@
DataChannelType channel = Passive ///< Data channel type.
);
+ /** Create a directory on the remote FTP host.
+
+ @return
+ PTrue if the directory was created successfully.
+ */
+ PBoolean CreateDirectory(
+ const PString & path ///< Name of the directory to create.
+ );
+
/** Get status information for the file path specified.
@return
Modified: ptlib/trunk/src/ptclib/ftpclnt.cxx
===================================================================
--- ptlib/trunk/src/ptclib/ftpclnt.cxx 2008-08-25 20:14:24 UTC (rev 20736)
+++ ptlib/trunk/src/ptclib/ftpclnt.cxx 2008-08-26 11:44:46 UTC (rev 20737)
@@ -165,6 +165,12 @@
}
+PBoolean PTFPClient::CreateDirectory(const PString & path)
+{
+ return ExecuteCommand (MKD, directory) / 100 == 2;
+}
+
+
PString PFTPClient::GetFileStatus(const PString & path, DataChannelType ctype)
{
if (ExecuteCommand(STATcmd, path)/100 == 2 && lastResponseInfo.Find(path) != P_MAX_INDEX) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2008-08-28 02:10:35
|
Revision: 20747
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20747&view=rev
Author: rjongbloed
Date: 2008-08-28 02:10:45 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
Fixed issue if re-use a PSafePtr using the collection assignment, e.g. code like:
PSafePtr<MyObj> ptr;
while ((ptr = myList) != NULL) {
ptr->DoSomething();
myList.Remove(ptr);
}
Modified Paths:
--------------
ptlib/trunk/src/ptlib/common/safecoll.cxx
Property Changed:
----------------
ptlib/trunk/
Property changes on: ptlib/trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /ptlib/branches/v2_2:20746
Modified: ptlib/trunk/src/ptlib/common/safecoll.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/safecoll.cxx 2008-08-28 02:07:42 UTC (rev 20746)
+++ ptlib/trunk/src/ptlib/common/safecoll.cxx 2008-08-28 02:10:45 UTC (rev 20747)
@@ -444,6 +444,7 @@
ExitSafetyMode(WithDereference);
collection = &safeCollection;
+ currentObject = NULL;
lockMode = PSafeReadWrite;
Assign((PINDEX)0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2008-08-29 02:15:09
|
Revision: 20764
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20764&view=rev
Author: rjongbloed
Date: 2008-08-29 02:15:19 +0000 (Fri, 29 Aug 2008)
Log Message:
-----------
Exposed internal function for splitting vars and params.
Modified Paths:
--------------
ptlib/trunk/include/ptclib/url.h
ptlib/trunk/src/ptclib/url.cxx
Modified: ptlib/trunk/include/ptclib/url.h
===================================================================
--- ptlib/trunk/include/ptclib/url.h 2008-08-29 01:06:49 UTC (rev 20763)
+++ ptlib/trunk/include/ptclib/url.h 2008-08-29 02:15:19 UTC (rev 20764)
@@ -186,13 +186,22 @@
TranslationType type ///< Type of translation.
);
+ /** Split a string to a dictionary of names and values. */
+ static void SplitVars(
+ const PString & str, ///< String to split into variables.
+ PStringToString & vars, ///< Dictionary of variable names and values.
+ char sep1, ///< Separater between pairs
+ char sep2 ///< Separater between key and value
+ );
+
/** Split a string in &= form to a dictionary of names and values. */
static void SplitQueryVars(
const PString & queryStr, ///< String to split into variables.
PStringToString & queryVars ///< Dictionary of variable names and values.
- );
+ ) { SplitVars(queryStr, queryVars, '&', '='); }
+
/// Get the scheme field of the URL.
const PCaselessString & GetScheme() const { return scheme; }
Modified: ptlib/trunk/src/ptclib/url.cxx
===================================================================
--- ptlib/trunk/src/ptclib/url.cxx 2008-08-29 01:06:49 UTC (rev 20763)
+++ ptlib/trunk/src/ptclib/url.cxx 2008-08-29 02:15:19 UTC (rev 20764)
@@ -261,7 +261,7 @@
}
-static void SplitVars(const PString & str, PStringToString & vars, char sep1, char sep2)
+void PURL::SplitVars(const PString & str, PStringToString & vars, char sep1, char sep2)
{
vars.RemoveAll();
@@ -290,12 +290,6 @@
}
-void PURL::SplitQueryVars(const PString & queryStr, PStringToString & queryVars)
-{
- SplitVars(queryStr, queryVars, '&', '=');
-}
-
-
PBoolean PURL::InternalParse(const char * cstr, const char * defaultScheme)
{
urlString = cstr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2008-08-29 06:41:49
|
Revision: 20766
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20766&view=rev
Author: rjongbloed
Date: 2008-08-29 06:41:59 +0000 (Fri, 29 Aug 2008)
Log Message:
-----------
Fixed issue with STUN not working if DNS not available when it is created. Now saves host name for next attempt.
Modified Paths:
--------------
ptlib/trunk/include/ptclib/pnat.h
ptlib/trunk/include/ptclib/pstun.h
ptlib/trunk/src/ptclib/pnat.cxx
ptlib/trunk/src/ptclib/pstun.cxx
Modified: ptlib/trunk/include/ptclib/pnat.h
===================================================================
--- ptlib/trunk/include/ptclib/pnat.h 2008-08-29 04:02:51 UTC (rev 20765)
+++ ptlib/trunk/include/ptclib/pnat.h 2008-08-29 06:41:59 UTC (rev 20766)
@@ -67,6 +67,14 @@
//@}
+ /**@name Overrides from PObject */
+ //@{
+ virtual void PrintOn(
+ ostream & strm
+ ) const;
+ //@}
+
+
/**@name General Functions */
//@{
/** Factory Create
Modified: ptlib/trunk/include/ptclib/pstun.h
===================================================================
--- ptlib/trunk/include/ptclib/pstun.h 2008-08-29 04:02:51 UTC (rev 20765)
+++ ptlib/trunk/include/ptclib/pstun.h 2008-08-29 06:41:59 UTC (rev 20766)
@@ -195,11 +195,11 @@
PIPSocket::Address & internalAddress
) const;
- /**Invalidates the cached external address
+ /**Invalidates the cached addresses and modes.
This allows to lazily update the external address cache at the next
attempt to get the external address.
*/
- void InvalidateExternalAddressCache();
+ void InvalidateCache();
/**Create a single socket.
The STUN protocol is used to create a socket for which the external IP
@@ -286,15 +286,16 @@
);
protected:
- PIPSocket::Address serverAddress;
+ PString serverHost;
WORD serverPort;
PTimeInterval replyTimeout;
PINDEX pollRetries;
PINDEX numSocketsForPairing;
- bool OpenSocket(PUDPSocket & socket, PortInfo & portInfo, const PIPSocket::Address & binding) const;
+ bool OpenSocket(PUDPSocket & socket, PortInfo & portInfo, const PIPSocket::Address & binding);
NatTypes natType;
+ PIPSocket::Address cachedServerAddress;
PIPSocket::Address cachedExternalAddress;
PIPSocket::Address interfaceAddress;
PTime timeAddressObtained;
Modified: ptlib/trunk/src/ptclib/pnat.cxx
===================================================================
--- ptlib/trunk/src/ptclib/pnat.cxx 2008-08-29 04:02:51 UTC (rev 20765)
+++ ptlib/trunk/src/ptclib/pnat.cxx 2008-08-29 06:41:59 UTC (rev 20766)
@@ -136,6 +136,12 @@
}
+void PNatMethod::PrintOn(ostream & strm) const
+{
+ strm << GetName() << " server " << GetServer();
+}
+
+
PString PNatMethod::GetServer() const
{
PStringStream str;
Modified: ptlib/trunk/src/ptclib/pstun.cxx
===================================================================
--- ptlib/trunk/src/ptclib/pstun.cxx 2008-08-29 04:02:51 UTC (rev 20765)
+++ ptlib/trunk/src/ptclib/pstun.cxx 2008-08-29 06:41:59 UTC (rev 20766)
@@ -51,8 +51,7 @@
///////////////////////////////////////////////////////////////////////
PSTUNClient::PSTUNClient()
- : serverAddress(0),
- serverPort(DefaultPort),
+ : serverPort(DefaultPort),
replyTimeout(DEFAULT_REPLY_TIMEOUT),
pollRetries(DEFAULT_POLL_RETRIES),
numSocketsForPairing(DEFAULT_NUM_SOCKETS_FOR_PAIRING),
@@ -65,8 +64,7 @@
PSTUNClient::PSTUNClient(const PString & server,
WORD portBase, WORD portMax,
WORD portPairBase, WORD portPairMax)
- : serverAddress(0),
- serverPort(DefaultPort),
+ : serverPort(DefaultPort),
replyTimeout(DEFAULT_REPLY_TIMEOUT),
pollRetries(DEFAULT_POLL_RETRIES),
numSocketsForPairing(DEFAULT_NUM_SOCKETS_FOR_PAIRING),
@@ -82,7 +80,7 @@
PSTUNClient::PSTUNClient(const PIPSocket::Address & address, WORD port,
WORD portBase, WORD portMax,
WORD portPairBase, WORD portPairMax)
- : serverAddress(address),
+ : serverHost(address.AsString()),
serverPort(port),
replyTimeout(DEFAULT_REPLY_TIMEOUT),
pollRetries(DEFAULT_POLL_RETRIES),
@@ -94,9 +92,10 @@
SetPortRanges(portBase, portMax, portPairBase, portPairMax);
}
+
void PSTUNClient::Initialise(const PString & server,
- WORD portBase, WORD portMax,
- WORD portPairBase, WORD portPairMax)
+ WORD portBase, WORD portMax,
+ WORD portPairBase, WORD portPairMax)
{
SetServer(server);
SetPortRanges(portBase, portMax, portPairBase, portPairMax);
@@ -105,46 +104,59 @@
bool PSTUNClient::GetServerAddress(PIPSocket::Address & address, WORD & port) const
{
- if (!serverAddress.IsValid() || serverPort == 0)
+ if (serverPort == 0)
return false;
- address = serverAddress;
port = serverPort;
- return true;
+
+ if (cachedServerAddress.IsValid()) {
+ address = cachedServerAddress;
+ return true;
+ }
+
+ return PIPSocket::GetHostAddress(serverHost, address);
}
PBoolean PSTUNClient::SetServer(const PString & server)
{
+ PString host;
+ WORD port = serverPort;
+
PINDEX colon = server.Find(':');
- if (colon == P_MAX_INDEX) {
- if (!PIPSocket::GetHostAddress(server, serverAddress)) {
- PTRACE(2, "STUN\tCould not find host \"" << server << "\".");
- return false;
- }
- }
+ if (colon == P_MAX_INDEX)
+ host = server;
else {
- PString hostname = server.Left(colon);
- if (!PIPSocket::GetHostAddress(hostname, serverAddress)) {
- PTRACE(2, "STUN\tCould not find host \"" << hostname << "\".");
- return false;
- }
+ host = server.Left(colon);
PString service = server.Mid(colon+1);
- if ((serverPort = PIPSocket::GetPortByService("udp", service)) == 0) {
+ if ((port = PIPSocket::GetPortByService("udp", service)) == 0) {
PTRACE(2, "STUN\tCould not find service \"" << service << "\".");
return false;
}
}
- return serverAddress.IsValid() && serverPort != 0;
+ if (host.IsEmpty() || port == 0)
+ return false;
+
+ if (serverHost == host && serverPort == port)
+ return true;
+
+ serverHost = host;
+ serverPort = port;
+ InvalidateCache();
+ return true;
}
PBoolean PSTUNClient::SetServer(const PIPSocket::Address & address, WORD port)
{
- serverAddress = address;
+ if (!address.IsValid() || port == 0)
+ return false;
+
+ serverHost = address.AsString();
+ cachedServerAddress = address;
serverPort = port;
- return serverAddress.IsValid() && serverPort != 0;
+ return true;
}
#pragma pack(1)
@@ -421,8 +433,18 @@
};
-bool PSTUNClient::OpenSocket(PUDPSocket & socket, PortInfo & portInfo, const PIPSocket::Address & binding) const
+bool PSTUNClient::OpenSocket(PUDPSocket & socket, PortInfo & portInfo, const PIPSocket::Address & binding)
{
+ if (serverPort == 0) {
+ PTRACE(1, "STUN\tServer port not set.");
+ return false;
+ }
+
+ if (!cachedServerAddress.IsValid() || !PIPSocket::GetHostAddress(serverHost, cachedServerAddress)) {
+ PTRACE(2, "STUN\tCould not find host \"" << serverHost << "\".");
+ return false;
+ }
+
PWaitAndSignal mutex(portInfo.mutex);
WORD startPort = portInfo.currentPort;
@@ -433,7 +455,7 @@
portInfo.currentPort = portInfo.basePort;
if (socket.Listen(binding, 1, portInfo.currentPort)) {
- socket.SetSendAddress(serverAddress, serverPort);
+ socket.SetSendAddress(cachedServerAddress, serverPort);
socket.SetReadTimeout(replyTimeout);
return true;
}
@@ -451,9 +473,6 @@
if (!force && natType != UnknownNat)
return natType;
- if (!serverAddress.IsValid() || serverPort == 0)
- return natType = UnknownNat;
-
PList<PUDPSocket> sockets;
PIPSocket::InterfaceTable interfaces;
@@ -498,7 +517,7 @@
if (requestI.Write(*socket))
selectList += *socket;
else {
- PTRACE(1, "STUN\tError writing to server " << serverAddress << ':' << serverPort << " - " << socket->GetErrorText(PChannel::LastWriteError));
+ PTRACE(1, "STUN\tError writing to " << *this << " - " << socket->GetErrorText(PChannel::LastWriteError));
}
}
@@ -521,7 +540,7 @@
}
if (replySocket == NULL) {
- PTRACE(3, "STUN\tNo response to server " << serverAddress << ':' << serverPort);
+ PTRACE(3, "STUN\tNo response to " << *this);
return natType = BlockedNat; // No response usually means blocked
}
@@ -529,7 +548,7 @@
PSTUNMappedAddress * mappedAddress = (PSTUNMappedAddress *)responseI.FindAttribute(PSTUNAttribute::MAPPED_ADDRESS);
if (mappedAddress == NULL) {
- PTRACE(2, "STUN\tExpected mapped address attribute from server " << serverAddress << ':' << serverPort);
+ PTRACE(2, "STUN\tExpected mapped address attribute from " << *this);
return natType = UnknownNat; // Protocol error
}
@@ -571,14 +590,14 @@
mappedAddress = (PSTUNMappedAddress *)responseI2.FindAttribute(PSTUNAttribute::MAPPED_ADDRESS);
if (mappedAddress == NULL) {
- PTRACE(2, "STUN\tExpected mapped address attribute from server " << serverAddress << ':' << serverPort);
+ PTRACE(2, "STUN\tExpected mapped address attribute from " << *this);
return UnknownNat; // Protocol error
}
if (mappedAddress->port != mappedPortI || mappedAddress->GetIP() != mappedAddressI)
return natType = SymmetricNat;
- replySocket->SetSendAddress(serverAddress, serverPort);
+ replySocket->SetSendAddress(cachedServerAddress, serverPort);
PSTUNMessage requestIII(PSTUNMessage::BindingRequest);
requestIII.SetAttribute(PSTUNChangeRequest(false, true));
PSTUNMessage responseIII;
@@ -651,14 +670,14 @@
PSTUNMessage response;
if (!response.Poll(socket, request, pollRetries))
{
- PTRACE(1, "STUN\tServer " << serverAddress << ':' << serverPort << " unexpectedly went offline.");
+ PTRACE(1, "STUN\t" << *this << " unexpectedly went offline.");
return false;
}
PSTUNMappedAddress * mappedAddress = (PSTUNMappedAddress *)response.FindAttribute(PSTUNAttribute::MAPPED_ADDRESS);
if (mappedAddress == NULL)
{
- PTRACE(2, "STUN\tExpected mapped address attribute from server " << serverAddress << ':' << serverPort);
+ PTRACE(2, "STUN\tExpected mapped address attribute from " << *this);
return false;
}
@@ -679,8 +698,11 @@
}
-void PSTUNClient::InvalidateExternalAddressCache() {
+void PSTUNClient::InvalidateCache()
+{
+ cachedServerAddress = 0;
cachedExternalAddress = 0;
+ interfaceAddress = 0;
natType = UnknownNat;
}
@@ -744,10 +766,10 @@
return true;
}
- PTRACE(2, "STUN\tExpected mapped address attribute from server " << serverAddress << ':' << serverPort);
+ PTRACE(2, "STUN\tExpected mapped address attribute from " << *this);
}
else
- PTRACE(1, "STUN\tServer " << serverAddress << ':' << serverPort << " unexpectedly went offline.");
+ PTRACE(1, "STUN\t" << *this << " unexpectedly went offline.");
}
delete stunSocket;
@@ -797,7 +819,7 @@
{
PINDEX idx = stunSocket.Append(new PSTUNUDPSocket);
if (!OpenSocket(stunSocket[idx], pairedPortInfo, interfaceAddress)) {
- PTRACE(1, "STUN\tUnable to open socket to server " << serverAddress);
+ PTRACE(1, "STUN\tUnable to open socket to " << *this);
return false;
}
@@ -811,7 +833,7 @@
{
if (!response[i].Poll(stunSocket[i], request[i], pollRetries))
{
- PTRACE(1, "STUN\tServer " << serverAddress << ':' << serverPort << " unexpectedly went offline.");
+ PTRACE(1, "STUN\t" << *this << " unexpectedly went offline.");
return false;
}
}
@@ -821,7 +843,7 @@
PSTUNMappedAddress * mappedAddress = (PSTUNMappedAddress *)response[i].FindAttribute(PSTUNAttribute::MAPPED_ADDRESS);
if (mappedAddress == NULL)
{
- PTRACE(2, "STUN\tExpected mapped address attribute from server " << serverAddress << ':' << serverPort);
+ PTRACE(2, "STUN\tExpected mapped address attribute from " << *this);
return false;
}
if (GetNatType(PFalse) != SymmetricNat)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ms3...@us...> - 2008-08-30 08:03:27
|
Revision: 20770
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20770&view=rev
Author: ms30002000
Date: 2008-08-30 08:03:35 +0000 (Sat, 30 Aug 2008)
Log Message:
-----------
Add three more functions to ptlib.m4 to find sasl, expat and openldap.
Do not use them yet.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/ptlib.m4
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-30 00:00:24 UTC (rev 20769)
+++ ptlib/trunk/configure 2008-08-30 08:03:35 UTC (rev 20770)
@@ -662,6 +662,7 @@
CXX
CXXFLAGS
ac_ct_CXX
+HAS_EXPAT
PTLIBDIR
PTINSTDIR
INSTALLPREFIX
@@ -709,7 +710,6 @@
HAS_OPENSSL
P_STATIC_ENDLDLIBS
P_STATIC_LDFLAGS
-HAS_EXPAT
HAS_IPV6
SDL_CFLAGS
SDL_LIBS
@@ -3323,6 +3323,12 @@
+
+
+
+
+
+
PTLIBDIR=`pwd`
@@ -15458,6 +15464,7 @@
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
+HAS_EXPAT!$HAS_EXPAT$ac_delim
PTLIBDIR!$PTLIBDIR$ac_delim
PTINSTDIR!$PTINSTDIR$ac_delim
INSTALLPREFIX!$INSTALLPREFIX$ac_delim
@@ -15505,7 +15512,6 @@
HAS_OPENSSL!$HAS_OPENSSL$ac_delim
P_STATIC_ENDLDLIBS!$P_STATIC_ENDLDLIBS$ac_delim
P_STATIC_LDFLAGS!$P_STATIC_LDFLAGS$ac_delim
-HAS_EXPAT!$HAS_EXPAT$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
Modified: ptlib/trunk/ptlib.m4
===================================================================
--- ptlib/trunk/ptlib.m4 2008-08-30 00:00:24 UTC (rev 20769)
+++ ptlib/trunk/ptlib.m4 2008-08-30 08:03:35 UTC (rev 20770)
@@ -329,3 +329,133 @@
AC_MSG_RESULT(${ptlib_fdsize})
])
+dnl PTLIB_CHECK_SASL_INCLUDE
+dnl Try to find a library containing dlopen()
+dnl Arguments: $1 action if-found
+dnl $2 action if-not-found
+dnl Return: $DL_LIBS The libs for dlopen()
+AC_DEFUN([PTLIB_CHECK_SASL_INCLUDE],
+ [
+ ptlib_sasl=no
+ AC_MSG_CHECKING([if <sasl.h> works])
+ AC_COMPILE_IFELSE([[
+ #include <sasl.h>
+ int main(int argc,char **argv)
+ { int v = SASL_LOG_PASS; }
+ ]],
+ [
+ AC_MSG_RESULT(yes)
+ ptlib_sasl=yes
+ SASL_HEADER=
+ ],
+ [
+ AC_MSG_RESULT(no)
+ ])
+
+ if test "x${HAS_INCLUDE_SASL_H}" != "xyes" ; then
+ AC_MSG_CHECKING([if <sasl/sasl.h> works])
+ AC_COMPILE_IFELSE([[
+ #include <sasl/sasl.h>
+ int main(int argc,char **argv){ int v = SASL_LOG_PASS; }
+ ]],
+ [
+ AC_MSG_RESULT(yes)
+ ptlib_sasl=yes
+ SASL_HEADER=sasl
+ ],
+ [
+ AC_MSG_RESULT(no)
+ ])
+ fi
+ AS_IF([test AS_VAR_GET([ptlib_sasl]) = yes], [$1], [$2])[]
+ ])
+
+dnl PTLIB_FIND_OPENLDAP
+dnl Find OpenLDAP
+dnl Arguments: $STDCCFLAGS
+dnl Return: $STDCCFLAGS
+AC_DEFUN([PTLIB_FIND_OPENLDAP],
+ [
+ AC_ARG_WITH([ldap-dir],
+ AS_HELP_STRING([--with-ldap-dir=PFX],[Location of LDAP]),
+ [with_ldap_dir="$withval"])
+
+ ptlib_openldap=yes
+ if test "x${HAS_RESOLVER}" != "x1"; then
+ AC_MSG_NOTICE([OpenLDAP support disabled due to disabled dependency HAS_RESOLVER])
+ ptlib_openldap=no
+ fi
+
+ if test "x${ptlib_openldap}" = "xyes"; then
+ case "$target_os" in
+ solaris* | sunos* )
+ dnl posix4 is required by libldap_r on Solaris
+ ptlib_openldap_libs="-lposix4"
+ ;;
+ * )
+ ptlib_openldap_libs="-llber -lldap_r"
+ esac
+
+ if test "x${with_ldap_dir}" != "x"; then
+ ptlib_openldap_libs="${ptlib_openldap_libs} -L${with_ldap_dir}/lib"
+ ptlib_openldap_cflags="${ptlib_openldap_cflags} -I${with_ldap_dir}/include"
+ fi
+
+ old_LIBS="$LIBS"
+ old_CFLAGS="$CFLAGS"
+ LIBS="$LIBS ${ptlib_openldap_libs} $RESOLVER_LIBS"
+ CFLAGS="$CFLAGS ${ptlib_openldap_cflags}"
+
+ AC_CHECK_HEADERS([ldap.h], [ptlib_openldap=yes], [ptlib_openldap=no])
+ if test "x${ptlib_openldap}" = "xyes" ; then
+ AC_CHECK_LIB([ldap], [ldap_open], [ptlib_openldap=yes], [ptlib_openldap=no])
+ fi
+
+ LIBS="$old_LIBS"
+ CFLAGS="$old_CFLAGS"
+
+ if test "x${ptlib_openldap}" = "xyes" ; then
+ OPENLDAP_LIBS="-lldap ${ptlib_openldap_libs}"
+ OPENLDAP_CFLAGS="${ptlib_openldap_cflags}"
+ fi
+ fi
+ AS_IF([test AS_VAR_GET([ptlib_openldap]) = yes], [$1], [$2])[]
+ ])
+
+AC_SUBST(HAS_EXPAT)
+dnl PTLIB_FIND_EXPAT
+dnl Find OpenLDAP
+dnl Arguments: $STDCCFLAGS
+dnl Return: $STDCCFLAGS
+AC_DEFUN([PTLIB_FIND_EXPAT],
+ [
+ AC_ARG_WITH([expat-dir],
+ AS_HELP_STRING([--with-expat-dir=PFX],[Location of expat XML parser]),
+ [with_expat_dir="$withval"])
+
+ ptlib_expat=no
+
+ if test "x${with_expat_dir}" != "x"; then
+ ptlib_expat_cflags="-I${with_expat_dir}/include"
+ ptlib_expat_libs="-L${with_expat_dir}/lib"
+ fi
+
+ old_LIBS="$LIBS"
+ old_CFLAGS="$CFLAGS"
+ LIBS="$LIBS ${ptlib_expat_libs}"
+ CFLAGS="$CFLAGS ${ptlib_expat_cflags}"
+
+ AC_CHECK_HEADERS([expat.h], [ptlib_expat=yes])
+ if test "x${ptlib_expat}" = "xyes" ; then
+ AC_CHECK_LIB([expat], [XML_ParserCreate], [ptlib_expat=yes], [ptlib_expat=no])
+ fi
+
+ LIBS="$old_LIBS"
+ CFLAGS="$old_CFLAGS"
+
+ if test "x${ptlib_expat}" = "xyes" ; then
+ EXPAT_LIBS="-lexpat ${ptlib_expat_libs}"
+ EXPAT_CFLAGS="${ptlib_expat_cflags}"
+ fi
+ AS_IF([test AS_VAR_GET([ptlib_expat]) = yes], [$1], [$2])[]
+ ])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ms3...@us...> - 2008-08-30 08:18:34
|
Revision: 20771
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20771&view=rev
Author: ms30002000
Date: 2008-08-30 08:18:44 +0000 (Sat, 30 Aug 2008)
Log Message:
-----------
Switch expat detection to new implementation.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
ptlib/trunk/ptlib.m4
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-30 08:03:35 UTC (rev 20770)
+++ ptlib/trunk/configure 2008-08-30 08:18:44 UTC (rev 20771)
@@ -1363,7 +1363,7 @@
--disable-sasl disable SASL support
--disable-openldap disable OpenLDAP support
--disable-openssl disable OpenSSL support
- --disable-expat disable XML support
+ --disable-expat disable expat XML support
--disable-ipv6 disable IPV6 support
--disable-sdl disable SDL support
--enable-configfile enable config file support
@@ -1409,6 +1409,7 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-expat-dir=PFX Location of expat XML parser
--with-directx-includedir=DIR
Location of DirectX include files
@@ -4022,9 +4023,6 @@
OS_MINOR=`uname -r | sed -e 's/[0-9][0-9]*\.//' -e 's/\..*$//'`
OSRELEASE=`expr $OS_MAJOR + $OS_MINOR`
SHAREDLIBEXT="dylib";
- if test -e /Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/include/expat.h ; then
- EXPATDIR=/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6
- fi
cat >>confdefs.h <<\_ACEOF
#define P_PTHREADS 1
@@ -10215,169 +10213,42 @@
-
# Check whether --enable-expat was given.
if test "${enable_expat+set}" = set; then
- enableval=$enable_expat;
+ enableval=$enable_expat; enable_expat=$enableval
+else
+ enable_expat=$default_expat
+
fi
-if test "${enable_expat}z" = "z" ; then
- enable_expat=$default_expat
-fi
-HAS_EXPAT=
if test "$enable_expat" = "no" ; then
{ echo "$as_me:$LINENO: Expat disabled" >&5
echo "$as_me: Expat disabled" >&6;}
else
- if test "${EXPATDIR}z" != "z" ; then
-for ac_header in ${EXPATDIR}/lib/expat.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header 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 <$ac_header>
-_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_cxx_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
+# Check whether --with-expat-dir was given.
+if test "${with_expat_dir+set}" = set; then
+ withval=$with_expat_dir; with_expat_dir="$withval"
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 $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header 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 <$ac_header>
-_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_cxx_preproc_warn_flag$ac_cxx_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
+ ptlib_expat=no
- ac_header_preproc=no
-fi
+ if test "x${with_expat_dir}" != "x"; then
+ ptlib_expat_cflags="-I${with_expat_dir}/include"
+ ptlib_expat_libs="-L${with_expat_dir}/lib"
+ fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+ old_LIBS="$LIBS"
+ old_CFLAGS="$CFLAGS"
+ LIBS="$LIBS ${ptlib_expat_libs}"
+ CFLAGS="$CFLAGS ${ptlib_expat_cflags}"
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- HAS_EXPAT=1
-fi
-
-done
-
- if test "${HAS_EXPAT:-unset}" != "unset" ; then
- STDCCFLAGS="$STDCCFLAGS -I${EXPATDIR}/lib"
- LDFLAGS="$LDFLAGS -L${EXPATDIR}/.libs"
- else
-
-for ac_header in ${EXPATDIR}/include/expat.h
+for ac_header in expat.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -10511,159 +10382,15 @@
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- HAS_EXPAT=1
-fi
-
-done
-
- if test "${HAS_EXPAT:-unset}" != "unset" ; then
- STDCCFLAGS="$STDCCFLAGS -I${EXPATDIR}/include"
- LDFLAGS="$LDFLAGS -L${EXPATDIR}/lib"
- fi
- fi
- else
-
-for ac_header in expat.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ ptlib_expat=yes
else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header 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 <$ac_header>
-_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_cxx_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
+ ptlib_expat=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 $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header 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 <$ac_header>
-_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- HAS_EXPAT=1
-fi
-
done
- if test "${HAS_EXPAT:-unset}" != "unset" ; then
- { echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+ if test "x${ptlib_expat}" = "xyes" ; then
+ { echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6; }
if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10725,27 +10452,41 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6; }
if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
+ ptlib_expat=yes
+else
+ ptlib_expat=no
+fi
+
+ fi
+
+ LIBS="$old_LIBS"
+ CFLAGS="$old_CFLAGS"
+
+ if test "x${ptlib_expat}" = "xyes" ; then
+ EXPAT_LIBS="-lexpat ${ptlib_expat_libs}"
+ EXPAT_CFLAGS="${ptlib_expat_cflags}"
+ fi
+ if test $ptlib_expat = yes; then
HAS_EXPAT=1
else
HAS_EXPAT=
fi
- fi
- fi
- if test "${HAS_EXPAT:-unset}" != "unset" ; then
+ if test "x${HAS_EXPAT}" = "x1" ; then
+
cat >>confdefs.h <<\_ACEOF
#define P_OEXPAT 1
_ACEOF
- ENDLDLIBS="$ENDLDLIBS -lexpat"
+ STDCCFLAGS="$STDCCFLAGS $EXPAT_CFLAGS"
+ ENDLDLIBS="$ENDLDLIBS $EXPAT_LIBS"
fi
fi
-
# Check whether --enable-ipv6 was given.
if test "${enable_ipv6+set}" = set; then
enableval=$enable_ipv6;
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-30 08:03:35 UTC (rev 20770)
+++ ptlib/trunk/configure.ac 2008-08-30 08:18:44 UTC (rev 20771)
@@ -132,9 +132,6 @@
OS_MINOR=[`uname -r | sed -e 's/[0-9][0-9]*\.//' -e 's/\..*$//'`]
OSRELEASE=`expr $OS_MAJOR + $OS_MINOR`
SHAREDLIBEXT="dylib";
- if test -e /Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/include/expat.h ; then
- EXPATDIR=/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6
- fi
AC_DEFINE(P_PTHREADS, 1, "PThreads found")
AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] )
;;
@@ -1169,43 +1166,24 @@
dnl MSWIN_CHECK_DIR expat,\libs\expat\
dnl MSWIN_CHECK_DIR expat,\Program Files\Expat 2.*
+AC_ARG_ENABLE([expat],
+ AS_HELP_STRING([--disable-expat],[disable expat XML support]),
+ [enable_expat=$enableval],
+ [enable_expat=$default_expat]
+ )
-AC_ARG_ENABLE(expat,
- [ --disable-expat disable XML support])
-if test "${enable_expat}z" = "z" ; then
- enable_expat=$default_expat
-fi
-
-HAS_EXPAT=
if test "$enable_expat" = "no" ; then
AC_MSG_NOTICE(Expat disabled)
else
- if test "${EXPATDIR}z" != "z" ; then
- AC_CHECK_HEADERS(${EXPATDIR}/lib/expat.h, HAS_EXPAT=1)
- if test "${HAS_EXPAT:-unset}" != "unset" ; then
- STDCCFLAGS="$STDCCFLAGS -I${EXPATDIR}/lib"
- LDFLAGS="$LDFLAGS -L${EXPATDIR}/.libs"
- else
- AC_CHECK_HEADERS(${EXPATDIR}/include/expat.h, HAS_EXPAT=1)
- if test "${HAS_EXPAT:-unset}" != "unset" ; then
- STDCCFLAGS="$STDCCFLAGS -I${EXPATDIR}/include"
- LDFLAGS="$LDFLAGS -L${EXPATDIR}/lib"
- fi
- fi
- else
- AC_CHECK_HEADERS(expat.h, HAS_EXPAT=1)
- if test "${HAS_EXPAT:-unset}" != "unset" ; then
- AC_CHECK_LIB(expat, XML_ParserCreate, HAS_EXPAT=1, HAS_EXPAT=)
- fi
- fi
+ PTLIB_FIND_EXPAT([HAS_EXPAT=1], [HAS_EXPAT=])
- if test "${HAS_EXPAT:-unset}" != "unset" ; then
+ if test "x${HAS_EXPAT}" = "x1" ; then
AC_DEFINE(P_OEXPAT, 1, "expat found")
- ENDLDLIBS="$ENDLDLIBS -lexpat"
+ STDCCFLAGS="$STDCCFLAGS $EXPAT_CFLAGS"
+ ENDLDLIBS="$ENDLDLIBS $EXPAT_LIBS"
fi
fi
-AC_SUBST(HAS_EXPAT)
dnl ########################################################################
dnl look for IPV6 functions
Modified: ptlib/trunk/ptlib.m4
===================================================================
--- ptlib/trunk/ptlib.m4 2008-08-30 08:03:35 UTC (rev 20770)
+++ ptlib/trunk/ptlib.m4 2008-08-30 08:18:44 UTC (rev 20771)
@@ -445,7 +445,7 @@
LIBS="$LIBS ${ptlib_expat_libs}"
CFLAGS="$CFLAGS ${ptlib_expat_cflags}"
- AC_CHECK_HEADERS([expat.h], [ptlib_expat=yes])
+ AC_CHECK_HEADERS([expat.h], [ptlib_expat=yes], [ptlib_expat=no])
if test "x${ptlib_expat}" = "xyes" ; then
AC_CHECK_LIB([expat], [XML_ParserCreate], [ptlib_expat=yes], [ptlib_expat=no])
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ms3...@us...> - 2008-08-30 19:39:20
|
Revision: 20782
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20782&view=rev
Author: ms30002000
Date: 2008-08-30 19:39:28 +0000 (Sat, 30 Aug 2008)
Log Message:
-----------
Make SHM_VIDEO variables consistent.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
ptlib/trunk/include/ptbuildopts.h.in
ptlib/trunk/make/ptbuildopts.mak.in
ptlib/trunk/src/ptlib/common/osutils.cxx
ptlib/trunk/src/ptlib/unix/Makefile
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-08-30 19:14:53 UTC (rev 20781)
+++ ptlib/trunk/configure 2008-08-30 19:39:28 UTC (rev 20782)
@@ -743,7 +743,7 @@
HAS_VIDFILE
HAS_APPSHARE
HAS_VIDEO_CAPTURE
-USE_SHM_VIDEO_DEVICES
+HAS_SHM_VIDEO
HAS_OSS
HAS_ALSA
HAS_ODBC
@@ -6649,7 +6649,7 @@
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
-default_shmvideo=yes
+HAS_SHM_VIDEO=1
HAS_VXML=1
if test "${enable_openh323}x" = "yesx" -o "${enable_opal}x" = "yesx" ; then
@@ -6690,8 +6690,8 @@
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
- default_shmvideo=no
HAS_VXML=1
+ HAS_SHM_VIDEO=
elif test "${enable_minsize}x" = "yesx" ; then
default_resolver=no
default_openldap=no
@@ -6730,8 +6730,8 @@
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
- default_shmvideo=no
HAS_VXML=
+ HAS_SHM_VIDEO=
fi
@@ -13760,28 +13760,58 @@
-# Check whether --enable-shm_video was given.
-if test "${enable_shm_video+set}" = set; then
- enableval=$enable_shm_video; shm_video=$enableval
+ { echo "$as_me:$LINENO: checking enable shared memory video devices" >&5
+echo $ECHO_N "checking enable shared memory video devices... $ECHO_C" >&6; }
+ # Check whether --enable-shmvideo was given.
+if test "${enable_shmvideo+set}" = set; then
+ enableval=$enable_shmvideo;
+ if test "x$enableval" = "xyes"; then
+ HAS_SHM_VIDEO=1
+ else
+ HAS_SHM_VIDEO=
+ fi
+
fi
-if test "${enable_shmvideo}z" = "z" ; then
- shm_video=$default_shmvideo
-fi
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: shmvideo support disabled due to disabled dependency " >&5
+echo "$as_me: shmvideo support disabled due to disabled dependency " >&6;}
+ HAS_SHM_VIDEO=
+ fi
+ fi
-USE_SHM_VIDEO_DEVICES=
-if test "$shm_video" = "yes" ; then
- USE_SHM_VIDEO_DEVICES=1
- { echo "$as_me:$LINENO: Shared memory video devices enabled" >&5
-echo "$as_me: Shared memory video devices enabled" >&6;}
-else
- { echo "$as_me:$LINENO: Shared memory video devices disabled" >&5
-echo "$as_me: Shared memory video devices disabled" >&6;}
-fi
+ if test "x" != "x"; then
+ if test "x$" != "x1"; then
+ { echo "$as_me:$LINENO: shmvideo support disabled due to disabled dependency " >&5
+echo "$as_me: shmvideo support disabled due to disabled dependency " >&6;}
+ HAS_SHM_VIDEO=
+ fi
+ fi
+ if test "x${HAS_SHM_VIDEO}" = "x1"; then
+cat >>confdefs.h <<\_ACEOF
+#define P_SHM_VIDEO 1
+_ACEOF
+
+ HAS_SHM_VIDEO=1
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ HAS_SHM_VIDEO=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+
+
+
+
+
+
HAS_ALSA=
HAS_OSS=
if test "x${HAS_AUDIO}" = "x1" ; then
@@ -15327,7 +15357,7 @@
HAS_VIDFILE!$HAS_VIDFILE$ac_delim
HAS_APPSHARE!$HAS_APPSHARE$ac_delim
HAS_VIDEO_CAPTURE!$HAS_VIDEO_CAPTURE$ac_delim
-USE_SHM_VIDEO_DEVICES!$USE_SHM_VIDEO_DEVICES$ac_delim
+HAS_SHM_VIDEO!$HAS_SHM_VIDEO$ac_delim
HAS_OSS!$HAS_OSS$ac_delim
HAS_ALSA!$HAS_ALSA$ac_delim
HAS_ODBC!$HAS_ODBC$ac_delim
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-30 19:14:53 UTC (rev 20781)
+++ ptlib/trunk/configure.ac 2008-08-30 19:39:28 UTC (rev 20782)
@@ -521,7 +521,7 @@
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
-default_shmvideo=yes
+HAS_SHM_VIDEO=1
HAS_VXML=1
if test "${enable_openh323}x" = "yesx" -o "${enable_opal}x" = "yesx" ; then
@@ -562,8 +562,8 @@
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
- default_shmvideo=no
HAS_VXML=1
+ HAS_SHM_VIDEO=
elif test "${enable_minsize}x" = "yesx" ; then
default_resolver=no
default_openldap=no
@@ -602,8 +602,8 @@
HAS_SOCKAGG=1
HAS_VIDFILE=1
HAS_APPSHARE=
- default_shmvideo=no
HAS_VXML=
+ HAS_SHM_VIDEO=
fi
@@ -1551,24 +1551,9 @@
dnl ########################################################################
dnl enable shared memory video devices (static video plugin)
+PTLIB_SIMPLE_OPTION([shmvideo], [SHM_VIDEO], [enable shared memory video devices])
-AC_ARG_ENABLE(shm_video,
- [ --enable-shmvideo enable shared memory video devices],
- shm_video=$enableval)
-if test "${enable_shmvideo}z" = "z" ; then
- shm_video=$default_shmvideo
-fi
-
-USE_SHM_VIDEO_DEVICES=
-if test "$shm_video" = "yes" ; then
- USE_SHM_VIDEO_DEVICES=1
- AC_MSG_NOTICE(Shared memory video devices enabled)
-else
- AC_MSG_NOTICE(Shared memory video devices disabled)
-fi
-AC_SUBST(USE_SHM_VIDEO_DEVICES)
-
dnl ########################################################################
dnl check for for audio drivers
Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in 2008-08-30 19:14:53 UTC (rev 20781)
+++ ptlib/trunk/include/ptbuildopts.h.in 2008-08-30 19:39:28 UTC (rev 20782)
@@ -562,7 +562,7 @@
#undef P_SOCKAGG
#undef P_VIDFILE
#undef P_ODBC
-#undef P_SHMVIDEO
+#undef P_SHM_VIDEO
/////////////////////////////////////////////////
//
Modified: ptlib/trunk/make/ptbuildopts.mak.in
===================================================================
--- ptlib/trunk/make/ptbuildopts.mak.in 2008-08-30 19:14:53 UTC (rev 20781)
+++ ptlib/trunk/make/ptbuildopts.mak.in 2008-08-30 19:39:28 UTC (rev 20782)
@@ -62,7 +62,7 @@
HAS_POP3SMTP = @HAS_POP3SMTP@
HAS_AUDIO = @HAS_AUDIO@
HAS_VIDEO = @HAS_VIDEO@
-USE_SHM_VIDEO_DEVICES = @USE_SHM_VIDEO_DEVICES@
+HAS_SHM_VIDEO = @HAS_SHM_VIDEO@
HAS_VXML = @HAS_VXML@
HAS_JABBER = @HAS_JABBER@
Modified: ptlib/trunk/src/ptlib/common/osutils.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/osutils.cxx 2008-08-30 19:14:53 UTC (rev 20781)
+++ ptlib/trunk/src/ptlib/common/osutils.cxx 2008-08-30 19:39:28 UTC (rev 20782)
@@ -1501,16 +1501,16 @@
#ifdef __MACOSX__
-#ifdef HAS_VIDEO
+#ifdef P_VIDEO
PWLibStupidOSXHacks::loadFakeVideoStuff = 1;
-#ifdef USE_SHM_VIDEO_DEVICES
+#ifdef P_SHM_VIDEO
PWLibStupidOSXHacks::loadShmVideoStuff = 1;
-#endif // USE_SHM_VIDEO_DEVICES
-#endif // HAS_VIDEO
+#endif // P_SHM_VIDEO
+#endif // P_VIDEO
-#ifdef HAS_AUDIO
+#ifdef P_AUDIO
PWLibStupidOSXHacks::loadCoreAudioStuff = 1;
-#endif // HAS_AUDIO
+#endif // P_AUDIO
#endif // __MACOSX__
Modified: ptlib/trunk/src/ptlib/unix/Makefile
===================================================================
--- ptlib/trunk/src/ptlib/unix/Makefile 2008-08-30 19:14:53 UTC (rev 20781)
+++ ptlib/trunk/src/ptlib/unix/Makefile 2008-08-30 19:39:28 UTC (rev 20782)
@@ -550,7 +550,7 @@
$(COMMON_SRC_DIR)/tinyjpeg.c \
$(COMMON_SRC_DIR)/jidctflt.c
-ifdef USE_SHM_VIDEO_DEVICES
+ifdef HAS_SHM_VIDEO
SOURCES += shmvideo.cxx
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cso...@us...> - 2008-08-31 05:08:38
|
Revision: 20788
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20788&view=rev
Author: csoutheren
Date: 2008-08-31 05:08:49 +0000 (Sun, 31 Aug 2008)
Log Message:
-----------
Some MS SDK installations (i.e. mine) appear to have DirectX and/or DirectSound installed
but are missing ddraw.h. So, make sure these systems can still compile ptlib
Modified Paths:
--------------
ptlib/trunk/configure.ac
ptlib/trunk/include/ptbuildopts.h.in
ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h
ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-31 05:07:05 UTC (rev 20787)
+++ ptlib/trunk/configure.ac 2008-08-31 05:08:49 UTC (rev 20788)
@@ -1633,6 +1633,7 @@
dnl MSWIN_CHECK_DIR dshow,\Program Files\Microsoft Visual Studio 8\VC\PlatformSDK\
dnl MSWIN_CHECK_DIR dshow,\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\
dnl MSWIN_CHECK_DIR dshow,\Program Files\Microsoft SDK\
+dnl MSWIN_FIND_FILE dshow,P_DIRECTSHOW_DDRAW_H,ddraw.h,include
dnl MSWIN_CHECK_DIR dshow,\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\
Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in 2008-08-31 05:07:05 UTC (rev 20787)
+++ ptlib/trunk/include/ptbuildopts.h.in 2008-08-31 05:08:49 UTC (rev 20788)
@@ -598,7 +598,7 @@
#if defined(_MSC_VER)
- #if defined(P_DIRECTSOUND) && !defined(P_DIRECTSOUND_WINCE)
+ #if defined(P_DIRECTSOUND) && !defined(P_DIRECTSOUND_WINCE) && defined(P_DIRECTSHOW_DDRAW_H)
#pragma include_alias(<dsound.h>, <@DIRECTX_DIR@/include/dsound.h>)
#pragma include_alias(<ddraw.h>, <@DIRECTX_DIR@/include/ddraw.h>)
Modified: ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h 2008-08-31 05:07:05 UTC (rev 20787)
+++ ptlib/trunk/include/ptlib/msos/ptlib/sound_directsound.h 2008-08-31 05:08:49 UTC (rev 20788)
@@ -36,7 +36,7 @@
#include <ptlib.h>
#include <ptbuildopts.h>
-#if defined(P_DIRECTSOUND) && ! defined(P_DIRECTSOUND_WINCE)
+#if defined(P_DIRECTSOUND) && ! defined(P_DIRECTSOUND_WINCE)
#include <ptlib/sound.h>
Modified: ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h 2008-08-31 05:07:05 UTC (rev 20787)
+++ ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h 2008-08-31 05:08:49 UTC (rev 20788)
@@ -31,7 +31,7 @@
#include <ptlib.h>
#include <ptbuildopts.h>
-#if defined(P_DIRECTSHOW) && defined(P_DIRECTSOUND)
+#if defined(P_DIRECTSHOW) && defined(P_DIRECTSOUND) && defined(P_DIRECTSHOW_DDRAW_H)
#include <ptlib/videoio.h>
#include <ptlib/vconvert.h>
#include <ptlib/pluginmgr.h>
Modified: ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx 2008-08-31 05:07:05 UTC (rev 20787)
+++ ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx 2008-08-31 05:08:49 UTC (rev 20788)
@@ -30,7 +30,7 @@
#include <ptlib.h>
-#if defined(P_DIRECTSHOW) && defined(P_DIRECTSOUND)
+#if defined(P_DIRECTSHOW) && defined(P_DIRECTSOUND) && defined(P_DIRECTSHOW_DDRAW_H)
#include "ptlib/msos/ptlib/vidinput_directx.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2008-08-31 06:25:37
|
Revision: 20792
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20792&view=rev
Author: rjongbloed
Date: 2008-08-31 06:25:47 +0000 (Sun, 31 Aug 2008)
Log Message:
-----------
Only do synchronous stop of a timer if it was not already stopped. This avoids some potential deadlocks where timer is stopped elsewhere by the logic.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/common/osutils.cxx
Property Changed:
----------------
ptlib/trunk/
Property changes on: ptlib/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /ptlib/branches/v2_2:20746
+ /ptlib/branches/v2_2:20746,20791
Modified: ptlib/trunk/src/ptlib/common/osutils.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/osutils.cxx 2008-08-31 06:22:28 UTC (rev 20791)
+++ ptlib/trunk/src/ptlib/common/osutils.cxx 2008-08-31 06:25:47 UTC (rev 20792)
@@ -702,10 +702,11 @@
void PTimer::Stop(bool wait)
{
- state = Stopped;
- milliseconds = 0;
-
- timerList->QueueRequest(PTimerList::RequestType::Stop, this, wait);
+ if (state != Stopped) {
+ state = Stopped;
+ milliseconds = 0;
+ timerList->QueueRequest(PTimerList::RequestType::Stop, this, wait);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2008-08-31 07:10:50
|
Revision: 20793
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20793&view=rev
Author: rjongbloed
Date: 2008-08-31 07:10:58 +0000 (Sun, 31 Aug 2008)
Log Message:
-----------
Fixed ddraw.h search in windows configure for different set up (i.e. mine). Round and around the circle we go!
Modified Paths:
--------------
ptlib/trunk/configure.ac
ptlib/trunk/include/ptbuildopts.h.in
ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-08-31 06:25:47 UTC (rev 20792)
+++ ptlib/trunk/configure.ac 2008-08-31 07:10:58 UTC (rev 20793)
@@ -1616,11 +1616,12 @@
dnl MSWIN_FIND_FILE dsound,P_DIRECTSOUND_LIB64,dsound.lib,lib/x64
dnl MSWIN_FIND_FILE dsound,P_DIRECTSOUND_LIB32,dsound.lib,lib/x86
dnl MSWIN_FIND_FILE dsound,P_DIRECTSOUND_LIB32,dsound.lib,lib
-dnl MSWIN_CHECK_DIR dsound,\Program Files\Microsoft DirectX SDK\
+dnl MSWIN_FIND_FILE dsound,P_DIRECTX_DDRAW_H,ddraw.h,include
+dnl MSWIN_CHECK_DIR dsound,\Program Files\Microsoft SDK\
dnl MSWIN_CHECK_DIR dsound,\Program Files\Microsoft Visual Studio 8\VC\PlatformSDK\
dnl MSWIN_CHECK_DIR dsound,\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\
-dnl MSWIN_CHECK_DIR dsound,\Program Files\Microsoft SDK\
dnl MSWIN_CHECK_DIR dsound,\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\
+dnl MSWIN_CHECK_DIR dsound,\Program Files\Microsoft DirectX SDK\
dnl ########################################################################
@@ -1628,12 +1629,12 @@
dnl MSWIN_DISPLAY dshow,Direct Show Support
dnl MSWIN_CHECK_FILE dshow,include\dshow.h,P_DIRECTSHOW=1
+dnl MSWIN_FIND_FILE dshow,P_DIRECTSHOW_DDRAW_H,ddraw.h,include
dnl MSWIN_DIR_SYMBOL dshow,DIRECTSHOW_DIR
dnl MSWIN_CHECK_DIR dshow,\Program Files\Microsoft SDKs\Windows\v6.*
+dnl MSWIN_CHECK_DIR dshow,\Program Files\Microsoft SDK\
dnl MSWIN_CHECK_DIR dshow,\Program Files\Microsoft Visual Studio 8\VC\PlatformSDK\
dnl MSWIN_CHECK_DIR dshow,\Program Files\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK\
-dnl MSWIN_CHECK_DIR dshow,\Program Files\Microsoft SDK\
-dnl MSWIN_FIND_FILE dshow,P_DIRECTSHOW_DDRAW_H,ddraw.h,include
dnl MSWIN_CHECK_DIR dshow,\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\
Modified: ptlib/trunk/include/ptbuildopts.h.in
===================================================================
--- ptlib/trunk/include/ptbuildopts.h.in 2008-08-31 06:25:47 UTC (rev 20792)
+++ ptlib/trunk/include/ptbuildopts.h.in 2008-08-31 07:10:58 UTC (rev 20793)
@@ -591,17 +591,20 @@
#else
#undef P_DIRECTSOUND
- #undef P_VFW_CAPTURE
- #undef P_DIRECTSHOW
-
#undef P_DIRECTSOUND_WINCE
+ #undef P_DIRECTX_DDRAW_H
+ #undef P_DIRECTSHOW_DDRAW_H
+
+ #if defined(P_DIRECTX_DDRAW_H) || defined(P_DIRECTSHOW_DDRAW_H)
+ #undef P_DIRECTSHOW
+ #endif
+
#if defined(_MSC_VER)
- #if defined(P_DIRECTSOUND) && !defined(P_DIRECTSOUND_WINCE) && defined(P_DIRECTSHOW_DDRAW_H)
+ #if defined(P_DIRECTSOUND) && !defined(P_DIRECTSOUND_WINCE)
#pragma include_alias(<dsound.h>, <@DIRECTX_DIR@/include/dsound.h>)
- #pragma include_alias(<ddraw.h>, <@DIRECTX_DIR@/include/ddraw.h>)
#undef P_DIRECTSOUND_LIB64
#undef P_DIRECTSOUND_LIB32
@@ -616,7 +619,11 @@
#if defined(P_DIRECTSHOW)
- #undef P_DIRECTDRAW_H
+ #ifdef P_DIRECTSHOW_DDRAW_H
+ #pragma include_alias(<ddraw.h>, <@DIRECTSHOW_DIR@/include/ddraw.h>)
+ #else
+ #pragma include_alias(<ddraw.h>, <@DIRECTX_DIR@/include/ddraw.h>)
+ #endif
#pragma include_alias(<dshow.h>, <@DIRECTSHOW_DIR@/include/dshow.h>)
#pragma include_alias(<amvideo.h>, <@DIRECTSHOW_DIR@/include/amvideo.h>)
Modified: ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h
===================================================================
--- ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h 2008-08-31 06:25:47 UTC (rev 20792)
+++ ptlib/trunk/include/ptlib/msos/ptlib/vidinput_directx.h 2008-08-31 07:10:58 UTC (rev 20793)
@@ -31,7 +31,7 @@
#include <ptlib.h>
#include <ptbuildopts.h>
-#if defined(P_DIRECTSHOW) && defined(P_DIRECTSOUND) && defined(P_DIRECTSHOW_DDRAW_H)
+#if defined(P_DIRECTSHOW)
#include <ptlib/videoio.h>
#include <ptlib/vconvert.h>
#include <ptlib/pluginmgr.h>
Modified: ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx 2008-08-31 06:25:47 UTC (rev 20792)
+++ ptlib/trunk/src/ptlib/msos/vidinput_directx.cxx 2008-08-31 07:10:58 UTC (rev 20793)
@@ -30,7 +30,7 @@
#include <ptlib.h>
-#if defined(P_DIRECTSHOW) && defined(P_DIRECTSOUND) && defined(P_DIRECTSHOW_DDRAW_H)
+#if defined(P_DIRECTSHOW)
#include "ptlib/msos/ptlib/vidinput_directx.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ms3...@us...> - 2008-09-01 17:12:05
|
Revision: 20810
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20810&view=rev
Author: ms30002000
Date: 2008-09-01 17:12:15 +0000 (Mon, 01 Sep 2008)
Log Message:
-----------
Switch openLDAP to new configure routines.
Modified Paths:
--------------
ptlib/trunk/configure
ptlib/trunk/configure.ac
Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure 2008-09-01 08:50:18 UTC (rev 20809)
+++ ptlib/trunk/configure 2008-09-01 17:12:15 UTC (rev 20810)
@@ -1409,6 +1409,7 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-ldap-dir=PFX Location of LDAP
--with-expat-dir=PFX Location of expat XML parser
--with-directx-includedir=DIR
Location of DirectX include files
@@ -4603,9 +4604,6 @@
fi
-if test ${OSTYPE} != solaris ; then
- LDAP_LIBRARIES="-llber -lldap_r"
-fi
USE_GCC=
@@ -9521,21 +9519,53 @@
# Check whether --enable-openldap was given.
if test "${enable_openldap+set}" = set; then
- enableval=$enable_openldap;
-fi
-
-
-if test "${enable_openldap}z" = "z" ; then
+ enableval=$enable_openldap; enable_openldap=$enableval
+else
enable_openldap=$default_openldap
+
fi
+
HAS_OPENLDAP=
if test "$enable_openldap" = "no" ; then
{ echo "$as_me:$LINENO: OpenLDAP disabled" >&5
echo "$as_me: OpenLDAP disabled" >&6;}
else
- if test "${HAS_RESOLVER:-unset}" != "unset" -o "${OSTYPE}" = "mingw" ; then
+
+# Check whether --with-ldap-dir was given.
+if test "${with_ldap_dir+set}" = set; then
+ withval=$with_ldap_dir; with_ldap_dir="$withval"
+fi
+
+
+ ptlib_openldap=yes
+ if test "x${HAS_RESOLVER}" != "x1"; then
+ { echo "$as_me:$LINENO: OpenLDAP support disabled due to disabled dependency HAS_RESOLVER" >&5
+echo "$as_me: OpenLDAP support disabled due to disabled dependency HAS_RESOLVER" >&6;}
+ ptlib_openldap=no
+ fi
+
+ if test "x${ptlib_openldap}" = "xyes"; then
+ case "$target_os" in
+ solaris* | sunos* )
+ ptlib_openldap_libs="-lposix4"
+ ;;
+ * )
+ ptlib_openldap_libs="-llber -lldap_r"
+ esac
+
+ if test "x${with_ldap_dir}" != "x"; then
+ ptlib_openldap_libs="${ptlib_openldap_libs} -L${with_ldap_dir}/lib"
+ ptlib_openldap_cflags="${ptlib_openldap_cflags} -I${with_ldap_dir}/include"
+ fi
+
+ old_LIBS="$LIBS"
+ old_CFLAGS="$CFLAGS"
+ LIBS="$LIBS ${ptlib_openldap_libs} $RESOLVER_LIBS"
+ CFLAGS="$CFLAGS ${ptlib_openldap_cflags}"
+
+
for ac_header in ldap.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -9670,24 +9700,21 @@
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
- HAS_OPENLDAP=1
+ ptlib_openldap=yes
+else
+ ptlib_openldap=no
fi
done
-
- if test "${OSTYPE:-unknown}" = "solaris"; then
- OPENLDAPSYSLIBS=-lposix4
- fi
-
- if test "${HAS_OPENLDAP:-unset}" != "unset" ; then
- { echo "$as_me:$LINENO: checking for ldap_open in -lldap" >&5
+ if test "x${ptlib_openldap}" = "xyes" ; then
+ { echo "$as_me:$LINENO: checking for ldap_open in -lldap" >&5
echo $ECHO_N "checking for ldap_open in -lldap... $ECHO_C" >&6; }
if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap $LDAP_LIBRARIES $RESOLVER_LIBS $ENDLDLIBS $OPENLDAPSYSLIBS $LIBS"
+LIBS="-lldap $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -9743,121 +9770,36 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_open" >&5
echo "${ECHO_T}$ac_cv_lib_ldap_ldap_open" >&6; }
if test $ac_cv_lib_ldap_ldap_open = yes; then
- HAS_OPENLDAP=1
+ ptlib_openldap=yes
else
- HAS_OPENLDAP=
+ ptlib_openldap=no
fi
- else
- { echo "$as_me:$LINENO: checking for /usr/local/include/ldap.h" >&5
-echo $ECHO_N "checking for /usr/local/include/ldap.h... $ECHO_C" >&6; }
-if test "${ac_cv_file__usr_local_include_ldap_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-if test -r "/usr/local/include/ldap.h"; then
- ac_cv_file__usr_local_include_ldap_h=yes
-else
- ac_cv_file__usr_local_include_ldap_h=no
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_ldap_h" >&5
-echo "${ECHO_T}$ac_cv_file__usr_local_include_ldap_h" >&6; }
-if test $ac_cv_file__usr_local_include_ldap_h = yes; then
- HAS_OPENLDAP=1
-fi
+ fi
- if test "${HAS_OPENLDAP:-unset}" != "unset" ; then
- OPENLDAPINCLUDEDIR=/usr/local/include
- OPENLDAPLIBDIR=/usr/local/lib
- { echo "$as_me:$LINENO: checking for ldap_open in -lldap" >&5
-echo $ECHO_N "checking for ldap_open in -lldap... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap -L/usr/local/lib $LDAP_LIBRARIES $RESOLVER_LIBS $ENDLDLIBS $OPENLDAPSYSLIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ LIBS="$old_LIBS"
+ CFLAGS="$old_CFLAGS"
-/* 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 ldap_open ();
-int
-main ()
-{
-return ldap_open ();
- ;
- 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
- ac_cv_lib_ldap_ldap_open=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_ldap_ldap_open=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
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_open" >&5
-echo "${ECHO_T}$ac_cv_lib_ldap_ldap_open" >&6; }
-if test $ac_cv_lib_ldap_ldap_open = yes; then
+ if test "x${ptlib_openldap}" = "xyes" ; then
+ OPENLDAP_LIBS="-lldap ${ptlib_openldap_libs}"
+ OPENLDAP_CFLAGS="${ptlib_openldap_cflags}"
+ fi
+ fi
+ if test $ptlib_openldap = yes; then
HAS_OPENLDAP=1
else
HAS_OPENLDAP=
fi
- fi
- fi
- fi
- if test "${HAS_OPENLDAP:-unset}" != "unset" ; then
- HAS_OPENLDAP=1
+ if test "x${HAS_OPENLDAP}" = "x1" ; then
cat >>confdefs.h <<\_ACEOF
#define P_LDAP 1
_ACEOF
- ENDLDLIBS="-lldap $LDAP_LIBRARIES $ENDLDLIBS"
- if test "${OPENLDAPINCLUDEDIR}unset" != "unset" ; then
- STDCCFLAGS="$STDCCFLAGS -I${OPENLDAPINCLUDEDIR}"
- fi
- if test "${OPENLDAPLIBDIR}unset" != "unset" ; then
- LDFLAGS="$LDFLAGS -L${OPENLDAPLIBDIR}"
- fi
+ ENDLDLIBS="$ENDLDLIBS $OPENLDAP_LIBS"
+ STDCCFLAGS="$STDCCFLAGS $OPENLDAP_CFLAGS"
fi
fi
@@ -9865,7 +9807,6 @@
-
# Check whether --enable-openssl was given.
if test "${enable_openssl+set}" = set; then
enableval=$enable_openssl; enable_openssl=$enableval
@@ -9884,10 +9825,11 @@
{ echo "$as_me:$LINENO: checking for OPENSSL" >&5
echo $ECHO_N "checking for OPENSSL... $ECHO_C" >&6; }
-if test -n "$OPENSSL_CFLAGS"; then
- pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$OPENSSL_CFLAGS"; then
+ pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
($PKG_CONFIG --exists --print-errors "openssl") 2>&5
ac_status=$?
@@ -9897,13 +9839,15 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
-if test -n "$OPENSSL_LIBS"; then
- pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$OPENSSL_LIBS"; then
+ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
($PKG_CONFIG --exists --print-errors "openssl") 2>&5
ac_status=$?
@@ -9913,8 +9857,9 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -9927,9 +9872,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl" 2>&1`
+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
else
- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl" 2>&1`
+ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
fi
# Put the nasty error message in config.log where it belongs
echo "$OPENSSL_PKG_ERRORS" >&5
@@ -10693,10 +10638,11 @@
{ echo "$as_me:$LINENO: checking for SDL" >&5
echo $ECHO_N "checking for SDL... $ECHO_C" >&6; }
-if test -n "$SDL_CFLAGS"; then
- pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$SDL_CFLAGS"; then
+ pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5
($PKG_CONFIG --exists --print-errors "sdl") 2>&5
ac_status=$?
@@ -10706,13 +10652,15 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
-if test -n "$SDL_LIBS"; then
- pkg_cv_SDL_LIBS="$SDL_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$SDL_LIBS"; then
+ pkg_cv_SDL_LIBS="$SDL_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl\"") >&5
($PKG_CONFIG --exists --print-errors "sdl") 2>&5
ac_status=$?
@@ -10722,8 +10670,9 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -10736,9 +10685,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl" 2>&1`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl"`
else
- SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl" 2>&1`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl"`
fi
# Put the nasty error message in config.log where it belongs
echo "$SDL_PKG_ERRORS" >&5
Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac 2008-09-01 08:50:18 UTC (rev 20809)
+++ ptlib/trunk/configure.ac 2008-09-01 17:12:15 UTC (rev 20810)
@@ -248,10 +248,6 @@
fi
-dnl solaris has it's own ldap library
-if test ${OSTYPE} != solaris ; then
- LDAP_LIBRARIES="-llber -lldap_r"
-fi
dnl ########################################################################
dnl get the gcc version
@@ -1041,54 +1037,26 @@
dnl MSWIN_CHECK_DIR openldap,\openldap\
dnl MSWIN_CHECK_DIR openldap,c:\openldap\
-AC_ARG_ENABLE(openldap,
- [ --disable-openldap disable OpenLDAP support])
+AC_ARG_ENABLE([openldap],
+ AS_HELP_STRING([--disable-openldap],[disable OpenLDAP support]),
+ [enable_openldap=$enableval],
+ [enable_openldap=$default_openldap]
+ )
-if test "${enable_openldap}z" = "z" ; then
- enable_openldap=$default_openldap
-fi
-
HAS_OPENLDAP=
if test "$enable_openldap" = "no" ; then
AC_MSG_NOTICE(OpenLDAP disabled)
else
- if test "${HAS_RESOLVER:-unset}" != "unset" -o "${OSTYPE}" = "mingw" ; then
- AC_CHECK_HEADERS(ldap.h, HAS_OPENLDAP=1)
-
- dnl posix4 is required by libldap_r on Solaris
- if test "${OSTYPE:-unknown}" = "solaris"; then
- OPENLDAPSYSLIBS=-lposix4
- fi
-
- dnl check also for lldap_r presence (required for thread safe OpenLDAP?)
- if test "${HAS_OPENLDAP:-unset}" != "unset" ; then
- AC_CHECK_LIB(ldap, ldap_open, HAS_OPENLDAP=1, HAS_OPENLDAP=,$LDAP_LIBRARIES $RESOLVER_LIBS $ENDLDLIBS $OPENLDAPSYSLIBS)
- else
- AC_CHECK_FILE(/usr/local/include/ldap.h, HAS_OPENLDAP=1)
- if test "${HAS_OPENLDAP:-unset}" != "unset" ; then
- OPENLDAPINCLUDEDIR=/usr/local/include
- OPENLDAPLIBDIR=/usr/local/lib
- AC_CHECK_LIB(ldap, ldap_open, HAS_OPENLDAP=1, HAS_OPENLDAP=,-L/usr/local/lib $LDAP_LIBRARIES $RESOLVER_LIBS $ENDLDLIBS $OPENLDAPSYSLIBS)
- fi
- fi
- fi
-
- if test "${HAS_OPENLDAP:-unset}" != "unset" ; then
- HAS_OPENLDAP=1
+ PTLIB_FIND_OPENLDAP([HAS_OPENLDAP=1], [HAS_OPENLDAP=])
+ if test "x${HAS_OPENLDAP}" = "x1" ; then
AC_DEFINE(P_LDAP, 1, "OpenLDAP found")
- ENDLDLIBS="-lldap $LDAP_LIBRARIES $ENDLDLIBS"
- if test "${OPENLDAPINCLUDEDIR}unset" != "unset" ; then
- STDCCFLAGS="$STDCCFLAGS -I${OPENLDAPINCLUDEDIR}"
- fi
- if test "${OPENLDAPLIBDIR}unset" != "unset" ; then
- LDFLAGS="$LDFLAGS -L${OPENLDAPLIBDIR}"
- fi
+ ENDLDLIBS="$ENDLDLIBS $OPENLDAP_LIBS"
+ STDCCFLAGS="$STDCCFLAGS $OPENLDAP_CFLAGS"
fi
fi
AC_SUBST(HAS_OPENLDAP)
-
dnl ########################################################################
dnl look for OpenSSL
dnl check for environment variable, then assume standard system install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X