[Opalvoip-svn] SF.net SVN: opalvoip:[21181] ptlib/trunk
Brought to you by:
csoutheren,
rjongbloed
From: <ms3...@us...> - 2008-09-28 11:09:49
|
Revision: 21181 http://opalvoip.svn.sourceforge.net/opalvoip/?rev=21181&view=rev Author: ms30002000 Date: 2008-09-28 11:09:47 +0000 (Sun, 28 Sep 2008) Log Message: ----------- Move the defaults so we can overwrite them depending on the platform. Modified Paths: -------------- ptlib/trunk/configure ptlib/trunk/configure.ac Modified: ptlib/trunk/configure =================================================================== --- ptlib/trunk/configure 2008-09-28 11:08:39 UTC (rev 21180) +++ ptlib/trunk/configure 2008-09-28 11:09:47 UTC (rev 21181) @@ -1387,10 +1387,10 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-pch disable precompiled headers --enable-minsize minimise the size of the lib by disabling least used options --enable-openh323 include only options needed with openh323 --enable-opal include only options needed with opal + --enable-pch disable precompiled headers --disable-tracing Remove PTRACE and all trace logging --disable-ansi-bool Use Windows-like integer BOOL over ANSI C++ bool --disable-atomicity Do not use atomicity.h @@ -3438,6 +3438,144 @@ +# Check whether --enable-minsize was given. +if test "${enable_minsize+set}" = set; then + enableval=$enable_minsize; +fi + +# Check whether --enable-openh323 was given. +if test "${enable_openh323+set}" = set; then + enableval=$enable_openh323; +fi + +# Check whether --enable-opal was given. +if test "${enable_opal+set}" = set; then + enableval=$enable_opal; +fi + + +HAS_SAMPLES=no +default_tracing=yes +default_resolver=yes +default_openldap=yes +default_openssl=yes +default_expat=yes +default_sdl=yes +default_sasl=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_ipv6=yes +HAS_QOS=1 +HAS_SOCKAGG=1 +HAS_VIDFILE=1 +HAS_APPSHARE= +HAS_SHM_VIDEO=1 +HAS_VXML=1 +HAS_EXCEPTIONS= + +if test "${enable_openh323}x" = "yesx" -o "${enable_opal}x" = "yesx" ; then + default_resolver=yes + default_openldap=no + default_openssl=yes + default_expat=no + default_sdl=yes + default_sasl=no + 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_ipv6=yes + HAS_QOS=1 + HAS_SOCKAGG=1 + HAS_VIDFILE=1 + HAS_APPSHARE= + HAS_VXML=1 + HAS_SHM_VIDEO= + HAS_EXCEPTIONS= +elif test "${enable_minsize}x" = "yesx" ; then + default_resolver=no + default_openldap=no + default_openssl=no + default_expat=no + default_sdl=no + default_sasl=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=1 + HAS_URL=1 + HAS_HTTP=1 + HAS_HTTPFORMS= + HAS_HTTPSVC= + HAS_SOAP= + HAS_XMLRPC= + HAS_JABBER= + HAS_CONFIG_FILE=0 + default_ipv6=no + HAS_QOS= + HAS_SOCKAGG=1 + HAS_VIDFILE=1 + HAS_APPSHARE= + HAS_VXML= + HAS_SHM_VIDEO= + HAS_EXCEPTIONS= +fi + + # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 @@ -4353,6 +4491,7 @@ fi + HAS_SHM_VIDEO= ;; mingw*) OSTYPE=mingw ; @@ -4452,6 +4591,7 @@ fi + HAS_SHM_VIDEO= ;; * ) OSTYPE="$target_os" ; @@ -6645,145 +6785,8 @@ -# Check whether --enable-minsize was given. -if test "${enable_minsize+set}" = set; then - enableval=$enable_minsize; -fi -# Check whether --enable-openh323 was given. -if test "${enable_openh323+set}" = set; then - enableval=$enable_openh323; -fi -# Check whether --enable-opal was given. -if test "${enable_opal+set}" = set; then - enableval=$enable_opal; -fi - - -HAS_SAMPLES=no -default_tracing=yes -default_resolver=yes -default_openldap=yes -default_openssl=yes -default_expat=yes -default_sdl=yes -default_sasl=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_ipv6=yes -HAS_QOS=1 -HAS_SOCKAGG=1 -HAS_VIDFILE=1 -HAS_APPSHARE= -HAS_SHM_VIDEO=1 -HAS_VXML=1 -HAS_EXCEPTIONS= - -if test "${enable_openh323}x" = "yesx" -o "${enable_opal}x" = "yesx" ; then - default_resolver=yes - default_openldap=no - default_openssl=yes - default_expat=no - default_sdl=yes - default_sasl=no - 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_ipv6=yes - HAS_QOS=1 - HAS_SOCKAGG=1 - HAS_VIDFILE=1 - HAS_APPSHARE= - HAS_VXML=1 - HAS_SHM_VIDEO= - HAS_EXCEPTIONS= -elif test "${enable_minsize}x" = "yesx" ; then - default_resolver=no - default_openldap=no - default_openssl=no - default_expat=no - default_sdl=no - default_sasl=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=1 - HAS_URL=1 - HAS_HTTP=1 - HAS_HTTPFORMS= - HAS_HTTPSVC= - HAS_SOAP= - HAS_XMLRPC= - HAS_JABBER= - HAS_CONFIG_FILE=0 - default_ipv6=no - HAS_QOS= - HAS_SOCKAGG=1 - HAS_VIDFILE=1 - HAS_APPSHARE= - HAS_VXML= - HAS_SHM_VIDEO= - HAS_EXCEPTIONS= -fi - - - # Check whether --enable-tracing was given. if test "${enable_tracing+set}" = set; then enableval=$enable_tracing; @@ -9938,10 +9941,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=$? @@ -9951,13 +9955,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=$? @@ -9967,8 +9973,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -9981,9 +9988,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 @@ -10745,10 +10752,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=$? @@ -10758,13 +10766,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=$? @@ -10774,8 +10784,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -10788,9 +10799,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-28 11:08:39 UTC (rev 21180) +++ ptlib/trunk/configure.ac 2008-09-28 11:09:47 UTC (rev 21181) @@ -69,6 +69,138 @@ AC_DEFINE_UNQUOTED([PTLIB_VERSION], ["$PTLIB_VERSION"], [PTLib version]) dnl ######################################################################## +dnl check for minimum sizing + +AC_ARG_ENABLE(minsize, + [ --enable-minsize minimise the size of the lib by disabling least used options]) +AC_ARG_ENABLE(openh323, + [ --enable-openh323 include only options needed with openh323]) +AC_ARG_ENABLE(opal, + [ --enable-opal include only options needed with opal]) + +dnl these are the default configure settings +HAS_SAMPLES=no +default_tracing=yes +default_resolver=yes +default_openldap=yes +default_openssl=yes +default_expat=yes +default_sdl=yes +default_sasl=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_ipv6=yes +HAS_QOS=1 +HAS_SOCKAGG=1 +HAS_VIDFILE=1 +HAS_APPSHARE= +HAS_SHM_VIDEO=1 +HAS_VXML=1 +HAS_EXCEPTIONS= + +if test "${enable_openh323}x" = "yesx" -o "${enable_opal}x" = "yesx" ; then + default_resolver=yes + default_openldap=no + default_openssl=yes + default_expat=no + default_sdl=yes + default_sasl=no + 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_ipv6=yes + HAS_QOS=1 + HAS_SOCKAGG=1 + HAS_VIDFILE=1 + HAS_APPSHARE= + HAS_VXML=1 + HAS_SHM_VIDEO= + HAS_EXCEPTIONS= +elif test "${enable_minsize}x" = "yesx" ; then + default_resolver=no + default_openldap=no + default_openssl=no + default_expat=no + default_sdl=no + default_sasl=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=1 + HAS_URL=1 + HAS_HTTP=1 + HAS_HTTPFORMS= + HAS_HTTPSVC= + HAS_SOAP= + HAS_XMLRPC= + HAS_JABBER= + HAS_CONFIG_FILE=0 + default_ipv6=no + HAS_QOS= + HAS_SOCKAGG=1 + HAS_VIDFILE=1 + HAS_APPSHARE= + HAS_VXML= + HAS_SHM_VIDEO= + HAS_EXCEPTIONS= +fi + +dnl ######################################################################## dnl set the OSTYPE and MACHTYPE AC_CANONICAL_TARGET() @@ -147,6 +279,7 @@ OS_TAG="P_CYGWIN" ; OSRELEASE="`uname -r`"; AC_CHECK_FUNC([swab], [AC_DEFINE([USE_SYSTEM_SWAB], [], [Use system swab()] )] ) + HAS_SHM_VIDEO= ;; mingw*) OSTYPE=mingw ; @@ -158,6 +291,7 @@ 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()] )] ) + HAS_SHM_VIDEO= ;; * ) OSTYPE="$target_os" ; @@ -476,139 +610,8 @@ fi AC_DEFINE_UNQUOTED(P_HAS_POSIX_READDIR_R, ${P_HAS_POSIX_READDIR_R}) -dnl ######################################################################## -dnl check for minimum sizing -AC_ARG_ENABLE(minsize, - [ --enable-minsize minimise the size of the lib by disabling least used options]) -AC_ARG_ENABLE(openh323, - [ --enable-openh323 include only options needed with openh323]) -AC_ARG_ENABLE(opal, - [ --enable-opal include only options needed with opal]) -dnl these are the default configure settings -HAS_SAMPLES=no -default_tracing=yes -default_resolver=yes -default_openldap=yes -default_openssl=yes -default_expat=yes -default_sdl=yes -default_sasl=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_ipv6=yes -HAS_QOS=1 -HAS_SOCKAGG=1 -HAS_VIDFILE=1 -HAS_APPSHARE= -HAS_SHM_VIDEO=1 -HAS_VXML=1 -HAS_EXCEPTIONS= - -if test "${enable_openh323}x" = "yesx" -o "${enable_opal}x" = "yesx" ; then - default_resolver=yes - default_openldap=no - default_openssl=yes - default_expat=no - default_sdl=yes - default_sasl=no - 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_ipv6=yes - HAS_QOS=1 - HAS_SOCKAGG=1 - HAS_VIDFILE=1 - HAS_APPSHARE= - HAS_VXML=1 - HAS_SHM_VIDEO= - HAS_EXCEPTIONS= -elif test "${enable_minsize}x" = "yesx" ; then - default_resolver=no - default_openldap=no - default_openssl=no - default_expat=no - default_sdl=no - default_sasl=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=1 - HAS_URL=1 - HAS_HTTP=1 - HAS_HTTPFORMS= - HAS_HTTPSVC= - HAS_SOAP= - HAS_XMLRPC= - HAS_JABBER= - HAS_CONFIG_FILE=0 - default_ipv6=no - HAS_QOS= - HAS_SOCKAGG=1 - HAS_VIDFILE=1 - HAS_APPSHARE= - HAS_VXML= - HAS_SHM_VIDEO= - HAS_EXCEPTIONS= -fi - - dnl ######################################################################## dnl check for tracing dnl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |