[Opalvoip-svn] SF.net SVN: opalvoip: [18734] opal/branches/v3_0
Brought to you by:
csoutheren,
rjongbloed
Menu
▾
▴
[Opalvoip-svn] SF.net SVN: opalvoip: [18734] opal/branches/v3_0
|
From: <rjo...@us...> - 2007-10-22 13:23:20
|
Revision: 18734
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18734&view=rev
Author: rjongbloed
Date: 2007-10-22 06:23:24 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
Many more PWLIBs changed to PTLIBs.
Modified Paths:
--------------
opal/branches/v3_0/Makefile.in
opal/branches/v3_0/configure
opal/branches/v3_0/configure.ac
opal/branches/v3_0/opal_inc.mak.in
Removed Paths:
-------------
opal/branches/v3_0/opal.dxx
Modified: opal/branches/v3_0/Makefile.in
===================================================================
--- opal/branches/v3_0/Makefile.in 2007-10-22 13:22:41 UTC (rev 18733)
+++ opal/branches/v3_0/Makefile.in 2007-10-22 13:23:24 UTC (rev 18734)
@@ -633,7 +633,7 @@
####################################################
-include @PWLIBDIR@/make/common.mak
+include @PTLIBDIR@/make/common.mak
PROG=opal
####################################################
@@ -671,7 +671,7 @@
ifeq ($(P_SHAREDLIB),1)
- SYSLIBS += -L$(PW_LIBDIR) -l$(PTLIB_BASE)$(LIB_TYPE)
+ SYSLIBS += -L$(PT_LIBDIR) -l$(PTLIB_BASE)$(LIB_TYPE)
ifeq ($(OSTYPE),beos)
# BeOS requires different options when building shared libraries
LDSOOPTS = -nostdlib -nostart
Modified: opal/branches/v3_0/configure
===================================================================
--- opal/branches/v3_0/configure 2007-10-22 13:22:41 UTC (rev 18733)
+++ opal/branches/v3_0/configure 2007-10-22 13:23:24 UTC (rev 18734)
@@ -310,7 +310,7 @@
#endif"
ac_subdirs_all="$ac_subdirs_all plugins"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX OPALDIR INSTALLPREFIX LIBDIR OPAL_VERSION PTLIB_CONFIG PWLIBDIR GCC_HAS_CLZ CPP EGREP SIZE16 SIZE32 OPAL_SYSTEM_SPEEX OPAL_HAVE_SPEEX_SPEEX_H OPAL_AUDIO OPAL_VIDEO OPAL_SIP OPAL_H323 OPAL_IAX2 OPAL_H224 OPAL_T38FAX OPAL_H450 OPAL_H460 OPAL_LID OPAL_IVR OPAL_RFC4175 OPAL_ZRTP HAS_LIBZRTP OPAL_SRTP HAS_LIBSRTP STDCCFLAGS ENDLDLIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA subdirs LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX OPALDIR INSTALLPREFIX LIBDIR OPAL_VERSION PTLIB_CONFIG PTLIBDIR GCC_HAS_CLZ CPP EGREP SIZE16 SIZE32 OPAL_SYSTEM_SPEEX OPAL_HAVE_SPEEX_SPEEX_H OPAL_AUDIO HAS_LIBDL OPAL_VIDEO OPAL_SIP OPAL_H323 OPAL_IAX2 OPAL_H224 OPAL_T38FAX OPAL_H450 OPAL_H460 OPAL_LID OPAL_IVR OPAL_RFC4175 OPAL_ZRTP HAS_LIBZRTP OPAL_SRTP HAS_LIBSRTP STDCCFLAGS ENDLDLIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA subdirs LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -849,7 +849,7 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --disable-versioncheck disable PWLib version check
+ --disable-versioncheck disable PTLib version check
--enable-localspeex use local version of Speex library rather than system version
--disable-audio disable audio codec support
--disable-video disable video codec support
@@ -2611,9 +2611,9 @@
video=yes
rfc4175=yes
-REQUIRED_PWLIB_MAJOR=1
-REQUIRED_PWLIB_MINOR=11
-REQUIRED_PWLIB_BUILD=0
+REQUIRED_PTLIB_MAJOR=2
+REQUIRED_PTLIB_MINOR=0
+REQUIRED_PTLIB_BUILD=0
OPALDIR=`pwd`
@@ -2661,10 +2661,13 @@
-if test "${PWLIBDIR:-unset}" != "unset" ; then
- as_ac_File=`echo "ac_cv_file_${PWLIBDIR}/version.h" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for ${PWLIBDIR}/version.h" >&5
-echo $ECHO_N "checking for ${PWLIBDIR}/version.h... $ECHO_C" >&6
+if test test "${PTLIBDIR:-unset}" = "unset" -a "${PWLIBDIR:-unset}" != "unset" ; then
+ PTLIBDIR=$PWLIBDIR
+fi
+if test "${PTLIBDIR:-unset}" != "unset" ; then
+ as_ac_File=`echo "ac_cv_file_${PTLIBDIR}/version.h" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for ${PTLIBDIR}/version.h" >&5
+echo $ECHO_N "checking for ${PTLIBDIR}/version.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_File+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2672,7 +2675,7 @@
{ { 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 "${PWLIBDIR}/version.h"; then
+if test -r "${PTLIBDIR}/version.h"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
@@ -2686,9 +2689,9 @@
fi
if test "${HAS_PTLIB:-unset}" = "unset" ; then
- as_ac_File=`echo "ac_cv_file_${OPALDIR}/../pwlib/version.h" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for ${OPALDIR}/../pwlib/version.h" >&5
-echo $ECHO_N "checking for ${OPALDIR}/../pwlib/version.h... $ECHO_C" >&6
+ as_ac_File=`echo "ac_cv_file_${OPALDIR}/../ptlib/version.h" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for ${OPALDIR}/../ptlib/version.h" >&5
+echo $ECHO_N "checking for ${OPALDIR}/../ptlib/version.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_File+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2696,7 +2699,7 @@
{ { 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 "${OPALDIR}/../pwlib/version.h"; then
+if test -r "${OPALDIR}/../ptlib/version.h"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
@@ -2709,11 +2712,11 @@
fi
if test "${HAS_PTLIB:-unset}" != "unset" ; then
- PWLIBDIR="${OPALDIR}/../pwlib"
+ PTLIBDIR="${OPALDIR}/../ptlib"
else
- as_ac_File=`echo "ac_cv_file_${HOME}/pwlib/include/ptlib.h" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for ${HOME}/pwlib/include/ptlib.h" >&5
-echo $ECHO_N "checking for ${HOME}/pwlib/include/ptlib.h... $ECHO_C" >&6
+ as_ac_File=`echo "ac_cv_file_${HOME}/ptlib/include/ptlib.h" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for ${HOME}/ptlib/include/ptlib.h" >&5
+echo $ECHO_N "checking for ${HOME}/ptlib/include/ptlib.h... $ECHO_C" >&6
if eval "test \"\${$as_ac_File+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -2721,7 +2724,7 @@
{ { 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 "${HOME}/pwlib/include/ptlib.h"; then
+if test -r "${HOME}/ptlib/include/ptlib.h"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
@@ -2734,7 +2737,7 @@
fi
if test "${HAS_PTLIB:-unset}" != "unset" ; then
- PWLIBDIR="${HOME}/pwlib"
+ PTLIBDIR="${HOME}/ptlib"
else
echo "$as_me:$LINENO: checking for /usr/local/include/ptlib.h" >&5
echo $ECHO_N "checking for /usr/local/include/ptlib.h... $ECHO_C" >&6
@@ -2833,7 +2836,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/share/pwlib/make/
+for as_dir in /usr/share/ptlib/make/
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2930,71 +2933,71 @@
fi
if test "${HAS_PTLIB:-unset}" = "unset" ; then
- { { echo "$as_me:$LINENO: error: \"Cannot find pwlib - please install or set PWLIBDIR and try again\"" >&5
-echo "$as_me: error: \"Cannot find pwlib - please install or set PWLIBDIR and try again\"" >&2;}
+ { { echo "$as_me:$LINENO: error: \"Cannot find PTLib - please install or set PTLIBDIR and try again\"" >&5
+echo "$as_me: error: \"Cannot find PTLib - please install or set PTLIBDIR and try again\"" >&2;}
{ (exit 1); exit 1; }; }
fi
-if test "${PWLIBDIR:-unset}" = "unset" ; then
+if test "${PTLIBDIR:-unset}" = "unset" ; then
if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
{ { echo "$as_me:$LINENO: error: \"Cannot find ptlib-config - please install and try again\"" >&5
echo "$as_me: error: \"Cannot find ptlib-config - please install and try again\"" >&2;}
{ (exit 1); exit 1; }; }
fi
- PWLIBDIR=`$PTLIB_CONFIG --prefix`
+ PTLIBDIR=`$PTLIB_CONFIG --prefix`
fi
-if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
- PWLIBDIR="/usr/share/pwlib/"
+if test "x$PTLIBDIR" = "x/usr" -o "x$PTLIBDIR" = "x/usr/"; then
+ PTLIBDIR="/usr/share/ptlib/"
fi
-if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
- PWLIBDIR="/usr/local/share/pwlib/"
+if test "x$PTLIBDIR" = "x/usr/local" -o "x$PTLIBDIR" = "x/usr/"; then
+ PTLIBDIR="/usr/local/share/ptlib/"
fi
-if test "x$PWLIBDIR" = "x${prefix}"; then
- PWLIBDIR="${prefix}/share/pwlib/"
+if test "x$PTLIBDIR" = "x${prefix}"; then
+ PTLIBDIR="${prefix}/share/ptlib/"
fi
-echo "PWLib prefix set to.... $PWLIBDIR"
+echo "PTLib prefix set to.... $PTLIBDIR"
-if test "${PWLIBDIR:-unset}" = "unset" ; then
+if test "${PTLIBDIR:-unset}" = "unset" ; then
PWVERSION=`$PTLIB_CONFIG --version`
PW_MAJOR_VERSION=`echo $PW_VERSION | cut -d'.' -f1`
PW_MINOR_VERSION=`echo $PW_VERSION | cut -d'.' -f2`
PW_BUILD_NUMBER=`echo $PW_VERSION | cut -d'.' -f3`
else
- PW_MAJOR_VERSION=`cat ${PWLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' '`
- PW_MINOR_VERSION=`cat ${PWLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`
- PW_BUILD_NUMBER=`cat ${PWLIBDIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`
+ PW_MAJOR_VERSION=`cat ${PTLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' '`
+ PW_MINOR_VERSION=`cat ${PTLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`
+ PW_BUILD_NUMBER=`cat ${PTLIBDIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`
PWVERSION="${PW_MAJOR_VERSION}.${PW_MINOR_VERSION}.${PW_BUILD_NUMBER}"
fi
# Check whether --enable-versioncheck or --disable-versioncheck was given.
if test "${enable_versioncheck+set}" = set; then
enableval="$enable_versioncheck"
- PWLIB_VERSION_CHECK=$enableval
+ PTLIB_VERSION_CHECK=$enableval
fi;
-echo "$as_me:$LINENO: checking Checking PWLib version ${PWVERSION}" >&5
-echo $ECHO_N "checking Checking PWLib version ${PWVERSION}... $ECHO_C" >&6
-if test "${PWLIB_VERSION_CHECK}x" = "nox" ; then
+echo "$as_me:$LINENO: checking Checking PTLib version ${PWVERSION}" >&5
+echo $ECHO_N "checking Checking PTLib version ${PWVERSION}... $ECHO_C" >&6
+if test "${PTLIB_VERSION_CHECK}x" = "nox" ; then
echo "$as_me:$LINENO: result: check disabled" >&5
echo "${ECHO_T}check disabled" >&6
else
- if test $PW_MAJOR_VERSION -lt $REQUIRED_PWLIB_MAJOR ; then
- { { echo "$as_me:$LINENO: error: Major version less than required $REQUIRED_PWLIB_MAJOR" >&5
-echo "$as_me: error: Major version less than required $REQUIRED_PWLIB_MAJOR" >&2;}
+ if test $PW_MAJOR_VERSION -lt $REQUIRED_PTLIB_MAJOR ; then
+ { { echo "$as_me:$LINENO: error: Major version less than required $REQUIRED_PTLIB_MAJOR" >&5
+echo "$as_me: error: Major version less than required $REQUIRED_PTLIB_MAJOR" >&2;}
{ (exit 1); exit 1; }; }
fi
- if test $PW_MINOR_VERSION -lt $REQUIRED_PWLIB_MINOR ; then
- { { echo "$as_me:$LINENO: error: Minor version less than required $REQUIRED_PWLIB_MINOR" >&5
-echo "$as_me: error: Minor version less than required $REQUIRED_PWLIB_MINOR" >&2;}
+ if test $PW_MINOR_VERSION -lt $REQUIRED_PTLIB_MINOR ; then
+ { { echo "$as_me:$LINENO: error: Minor version less than required $REQUIRED_PTLIB_MINOR" >&5
+echo "$as_me: error: Minor version less than required $REQUIRED_PTLIB_MINOR" >&2;}
{ (exit 1); exit 1; }; }
fi
- if test $PW_BUILD_NUMBER -lt $REQUIRED_PWLIB_BUILD ; then
- { { echo "$as_me:$LINENO: error: Build version less than required $REQUIRED_PWLIB_BUILD" >&5
-echo "$as_me: error: Build version less than required $REQUIRED_PWLIB_BUILD" >&2;}
+ if test $PW_BUILD_NUMBER -lt $REQUIRED_PTLIB_BUILD ; then
+ { { echo "$as_me:$LINENO: error: Build version less than required $REQUIRED_PTLIB_BUILD" >&5
+echo "$as_me: error: Build version less than required $REQUIRED_PTLIB_BUILD" >&2;}
{ (exit 1); exit 1; }; }
fi
echo "$as_me:$LINENO: result: ok" >&5
@@ -5862,8 +5865,290 @@
fi
+HAS_LIBDL=0
+for ac_header in dlfcn.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; 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 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 { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_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_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;}
+ { 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;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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_DLFCN=yes
+else
+ HAS_DLFCN=no
+fi
+
+done
+
+if test "$HAS_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
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <dlfcn.h>
+int
+main ()
+{
+void * p = dlopen("lib", 0);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ HAS_DLOPEN=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+HAS_DLOPEN=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test "$HAS_DLOPEN" = no ; 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: 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
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $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 gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_dl_dlopen=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
+ HAS_LIBDL=1
+else
+ HAS_LIBDL=0
+fi
+
+ fi
+fi
+
+
+
+
+
# Check whether --enable-video or --disable-video was given.
if test "${enable_video+set}" = set; then
enableval="$enable_video"
@@ -6975,7 +7260,7 @@
s,@LIBDIR@,$LIBDIR,;t t
s,@OPAL_VERSION@,$OPAL_VERSION,;t t
s,@PTLIB_CONFIG@,$PTLIB_CONFIG,;t t
-s,@PWLIBDIR@,$PWLIBDIR,;t t
+s,@PTLIBDIR@,$PTLIBDIR,;t t
s,@GCC_HAS_CLZ@,$GCC_HAS_CLZ,;t t
s,@CPP@,$CPP,;t t
s,@EGREP@,$EGREP,;t t
@@ -6984,6 +7269,7 @@
s,@OPAL_SYSTEM_SPEEX@,$OPAL_SYSTEM_SPEEX,;t t
s,@OPAL_HAVE_SPEEX_SPEEX_H@,$OPAL_HAVE_SPEEX_SPEEX_H,;t t
s,@OPAL_AUDIO@,$OPAL_AUDIO,;t t
+s,@HAS_LIBDL@,$HAS_LIBDL,;t t
s,@OPAL_VIDEO@,$OPAL_VIDEO,;t t
s,@OPAL_SIP@,$OPAL_SIP,;t t
s,@OPAL_H323@,$OPAL_H323,;t t
Modified: opal/branches/v3_0/configure.ac
===================================================================
--- opal/branches/v3_0/configure.ac 2007-10-22 13:22:41 UTC (rev 18733)
+++ opal/branches/v3_0/configure.ac 2007-10-22 13:23:24 UTC (rev 18734)
@@ -16,9 +16,9 @@
dnl this must be updated for every minor revision, and for
dnl builds when and as necessary
-REQUIRED_PWLIB_MAJOR=1
-REQUIRED_PWLIB_MINOR=11
-REQUIRED_PWLIB_BUILD=0
+REQUIRED_PTLIB_MAJOR=2
+REQUIRED_PTLIB_MINOR=0
+REQUIRED_PTLIB_BUILD=0
dnl ########################################################################
dnl set the OPAL directory to the current directory
@@ -66,20 +66,23 @@
AC_SUBST(OPAL_VERSION)
dnl ########################################################################
-dnl look for ptlib, use a preference order of explicit PWLIBDIR, directory
+dnl look for ptlib, use a preference order of explicit PTLIBDIR, directory
dnl at same level, home directory, /usr/local or /usr.
-if test "${PWLIBDIR:-unset}" != "unset" ; then
- AC_CHECK_FILE(${PWLIBDIR}/version.h, HAS_PTLIB=1)
+if test test "${PTLIBDIR:-unset}" = "unset" -a "${PWLIBDIR:-unset}" != "unset" ; then
+ PTLIBDIR=$PWLIBDIR
fi
+if test "${PTLIBDIR:-unset}" != "unset" ; then
+ AC_CHECK_FILE(${PTLIBDIR}/version.h, HAS_PTLIB=1)
+fi
if test "${HAS_PTLIB:-unset}" = "unset" ; then
- AC_CHECK_FILE(${OPALDIR}/../pwlib/version.h, HAS_PTLIB=1)
+ AC_CHECK_FILE(${OPALDIR}/../ptlib/version.h, HAS_PTLIB=1)
if test "${HAS_PTLIB:-unset}" != "unset" ; then
- PWLIBDIR="${OPALDIR}/../pwlib"
+ PTLIBDIR="${OPALDIR}/../ptlib"
else
- AC_CHECK_FILE(${HOME}/pwlib/include/ptlib.h, HAS_PTLIB=1)
+ AC_CHECK_FILE(${HOME}/ptlib/include/ptlib.h, HAS_PTLIB=1)
if test "${HAS_PTLIB:-unset}" != "unset" ; then
- PWLIBDIR="${HOME}/pwlib"
+ PTLIBDIR="${HOME}/ptlib"
else
AC_CHECK_FILE(/usr/local/include/ptlib.h, HAS_PTLIB=1)
if test "${HAS_PTLIB:-unset}" != "unset" ; then
@@ -87,7 +90,7 @@
else
AC_CHECK_FILE(/usr/include/ptlib.h, HAS_PTLIB=1)
if test "${HAS_PTLIB:-unset}" != "unset" ; then
- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make/)
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/make/)
else
AC_CHECK_FILE(${prefix}/include/ptlib.h, HAS_PTLIB=1)
if test "${HAS_PTLIB:-unset}" != "unset" ; then
@@ -100,63 +103,63 @@
fi
if test "${HAS_PTLIB:-unset}" = "unset" ; then
- AC_MSG_ERROR("Cannot find pwlib - please install or set PWLIBDIR and try again")
+ AC_MSG_ERROR("Cannot find PTLib - please install or set PTLIBDIR and try again")
fi
-if test "${PWLIBDIR:-unset}" = "unset" ; then
+if test "${PTLIBDIR:-unset}" = "unset" ; then
if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
AC_MSG_ERROR("Cannot find ptlib-config - please install and try again")
fi
- PWLIBDIR=`$PTLIB_CONFIG --prefix`
+ PTLIBDIR=`$PTLIB_CONFIG --prefix`
fi
-if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
- PWLIBDIR="/usr/share/pwlib/"
+if test "x$PTLIBDIR" = "x/usr" -o "x$PTLIBDIR" = "x/usr/"; then
+ PTLIBDIR="/usr/share/ptlib/"
fi
-if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
- PWLIBDIR="/usr/local/share/pwlib/"
+if test "x$PTLIBDIR" = "x/usr/local" -o "x$PTLIBDIR" = "x/usr/"; then
+ PTLIBDIR="/usr/local/share/ptlib/"
fi
-if test "x$PWLIBDIR" = "x${prefix}"; then
- PWLIBDIR="${prefix}/share/pwlib/"
+if test "x$PTLIBDIR" = "x${prefix}"; then
+ PTLIBDIR="${prefix}/share/ptlib/"
fi
-AC_SUBST(PWLIBDIR)
+AC_SUBST(PTLIBDIR)
-echo "PWLib prefix set to.... $PWLIBDIR"
+echo "PTLib prefix set to.... $PTLIBDIR"
-if test "${PWLIBDIR:-unset}" = "unset" ; then
+if test "${PTLIBDIR:-unset}" = "unset" ; then
PWVERSION=`$PTLIB_CONFIG --version`
PW_MAJOR_VERSION=`echo $PW_VERSION | cut -d'.' -f1`
PW_MINOR_VERSION=`echo $PW_VERSION | cut -d'.' -f2`
PW_BUILD_NUMBER=`echo $PW_VERSION | cut -d'.' -f3`
else
- PW_MAJOR_VERSION=`cat ${PWLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' '`
- PW_MINOR_VERSION=`cat ${PWLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`
- PW_BUILD_NUMBER=`cat ${PWLIBDIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`
+ PW_MAJOR_VERSION=`cat ${PTLIBDIR}/version.h | grep MAJOR_VERSION | cut -f3 -d' '`
+ PW_MINOR_VERSION=`cat ${PTLIBDIR}/version.h | grep MINOR_VERSION | cut -f3 -d' '`
+ PW_BUILD_NUMBER=`cat ${PTLIBDIR}/version.h | grep BUILD_NUMBER | cut -f3 -d' '`
PWVERSION="${PW_MAJOR_VERSION}.${PW_MINOR_VERSION}.${PW_BUILD_NUMBER}"
fi
AC_ARG_ENABLE(versioncheck,
- [ --disable-versioncheck disable PWLib version check],
- PWLIB_VERSION_CHECK=$enableval)
+ [ --disable-versioncheck disable PTLib version check],
+ PTLIB_VERSION_CHECK=$enableval)
-AC_MSG_CHECKING(Checking PWLib version ${PWVERSION})
-if test "${PWLIB_VERSION_CHECK}x" = "nox" ; then
+AC_MSG_CHECKING(Checking PTLib version ${PWVERSION})
+if test "${PTLIB_VERSION_CHECK}x" = "nox" ; then
AC_MSG_RESULT(check disabled)
else
- if test $PW_MAJOR_VERSION -lt $REQUIRED_PWLIB_MAJOR ; then
- AC_MSG_ERROR(Major version less than required $REQUIRED_PWLIB_MAJOR)
+ if test $PW_MAJOR_VERSION -lt $REQUIRED_PTLIB_MAJOR ; then
+ AC_MSG_ERROR(Major version less than required $REQUIRED_PTLIB_MAJOR)
fi
- if test $PW_MINOR_VERSION -lt $REQUIRED_PWLIB_MINOR ; then
- AC_MSG_ERROR(Minor version less than required $REQUIRED_PWLIB_MINOR)
+ if test $PW_MINOR_VERSION -lt $REQUIRED_PTLIB_MINOR ; then
+ AC_MSG_ERROR(Minor version less than required $REQUIRED_PTLIB_MINOR)
fi
- if test $PW_BUILD_NUMBER -lt $REQUIRED_PWLIB_BUILD ; then
- AC_MSG_ERROR(Build version less than required $REQUIRED_PWLIB_BUILD)
+ if test $PW_BUILD_NUMBER -lt $REQUIRED_PTLIB_BUILD ; then
+ AC_MSG_ERROR(Build version less than required $REQUIRED_PTLIB_BUILD)
fi
AC_MSG_RESULT(ok)
fi
-AC_SUBST(PWLIBDIR)
+AC_SUBST(PTLIBDIR)
dnl ########################################################################
dnl get the gcc version
Deleted: opal/branches/v3_0/opal.dxx
===================================================================
--- opal/branches/v3_0/opal.dxx 2007-10-22 13:22:41 UTC (rev 18733)
+++ opal/branches/v3_0/opal.dxx 2007-10-22 13:23:24 UTC (rev 18734)
@@ -1,131 +0,0 @@
-/**@name OPAL - Open Phone Abstraction Library
-
- This is a Open Source class library for the development of applications
- that wish to use multiple protocols, eg H.323 or SIP, for multi-media
- communications.
-
-@memo A Class Libarary implementing several telephony protocols.
-@version 1.1beta2
-@author Equivalence Pty. Ltd.
-*/
-
-// $Log: opal.dxx,v $
-// Revision 2.4 2006/04/08 01:07:08 rjongbloed
-// Add some documentation
-//
-// Revision 2.3 2002/02/11 03:24:17 dereks
-// Add SIP to list of include files.
-//
-// Revision 2.2 2002/02/11 02:27:54 dereks
-// Adjust format of CVS logging command.
-//
-// Revision 2.1 2002/02/11 02:17:21 dereks
-// Adjust include file list.
-//
-
-//@{
-
-/**@name Introduction
-\begin{center}
- {\Large{\bf Open Phone Abstraction Library}}
-\end{center}
-
-OPAL is an Open Source class library for the development of applications that
-wish to use multiple protocols, eg H.323 or SIP, for multi-media
-communications.
-
-*/
-
-/**@name Architecture
-<A REF=docs/overview.html>Overview
-*/
-
-
-/**@name Using OPAL
-Detailed tutorials will be forthcoming.
-
-@memo Brief examples.
-*/
-
-/**@name Class Reference
-
-@memo Documentation on all classes.
- */
- //@{
- //@Include: include/h323/h323.h
- //@Include: include/h323/h323ep.h
- //@Include: include/h323/h323con.h
- //@Include: include/h323/channels.h
- //@Include: include/h323/gkclient.h
- //@Include: include/h323/gkserver.h
- //@Include: include/h323/h225ras.h
- //@Include: include/h323/h235auth.h
- //@Include: include/h323/h323caps.h
- //@Include: include/h323/h323neg.h
- //@Include: include/h323/h323pdu.h
- //@Include: include/h323/h323rtp.h
- //@Include: include/h323/h450pdu.h
- //@Include: include/h323/q931.h
- //@Include: include/h323/transaddr.h
- //@Include: include/codec/allcodecs.h
- //@Include: include/codec/g711codec.h
- //@Include: include/codec/gsmcodec.h
- //@Include: include/codec/h261codec.h
- //@Include: include/codec/lpc10codec.h
- //@Include: include/codec/mscodecs.h
- //@Include: include/codec/rfc2833.h
- //@Include: include/lids/QTIoctl.h
- //@Include: include/lids/ixjDefs.h
- //@Include: include/lids/ixjlid.h
- //@Include: include/lids/lid.h
- //@Include: include/lids/lidep.h
- //@Include: include/lids/vblasterlid.h
- //@Include: include/lids/vpbapi.h
- //@Include: include/lids/vpblid.h
- //@Include: include/opal/connection.h
- //@Include: include/opal/call.h
- //@Include: include/opal/endpoint.h
- //@Include: include/opal/guid.h
- //@Include: include/opal/manager.h
- //@Include: include/opal/mediafmt.h
- //@Include: include/opal/mediastrm.h
- //@Include: include/opal/patch.h
- //@Include: include/opal/pcss.h
- //@Include: include/opal/transcoders.h
- //@Include: include/opal/transports.h
- //@Include: include/rtp/jitter.h
- //@Include: include/rtp/rtp.h
- //@Include: include/t120/h323t120.h
- //@Include: include/t120/t120proto.h
- //@Include: include/t120/x224.h
- //@Include: include/t38/h323t38.h
- //@Include: include/t38/t38proto.h
- //@Include: src/codec/gsm/inc/config.h
- //@Include: src/codec/gsm/inc/gsm.h
- //@Include: src/codec/gsm/inc/private.h
- //@Include: src/codec/gsm/inc/proto.h
- //@Include: src/codec/gsm/inc/unproto.h
- //@Include: src/codec/vic/bsd-endian.h
- //@Include: src/codec/vic/config.h
- //@Include: src/codec/vic/crdef.h
- //@Include: src/codec/vic/dct.h
- //@Include: src/codec/vic/encoder-h261.h
- //@Include: src/codec/vic/encoder.h
- //@Include: src/codec/vic/grabber.h
- //@Include: src/codec/vic/p64-huff.h
- //@Include: src/codec/vic/p64.h
- //@Include: src/codec/vic/p64encoder.h
- //@Include: src/codec/vic/transmitter.h
- //@Include: src/codec/vic/vid_coder.h
- //@Include: src/codec/vic/videoframe.h
- //@Include: src/codec/lpc10/src/f2c.h
- //@Include: src/codec/lpc10/bitio.h
- //@Include: src/codec/lpc10/lpc10.h
- //@Include: include/sip/sdp.h
- //@Include: include/sip/sip.h
- //@Include: include/sip/sipcon.h
- //@Include: include/sip/sipep.h
- //@Include: include/sip/sippdu.h
- //@}
-
-//@}
Modified: opal/branches/v3_0/opal_inc.mak.in
===================================================================
--- opal/branches/v3_0/opal_inc.mak.in 2007-10-22 13:22:41 UTC (rev 18733)
+++ opal/branches/v3_0/opal_inc.mak.in 2007-10-22 13:23:24 UTC (rev 18734)
@@ -87,17 +87,17 @@
#
OPALDIR=@OPALDIR@
-PWLIBDIR=@PWLIBDIR@
+PTLIBDIR=@PTLIBDIR@
LIBDIRS += $(OPALDIR)
ifdef LIBRARY_MAKEFILE
-include $(PWLIBDIR)/make/unix.mak
+include $(PTLIBDIR)/make/unix.mak
else
ifdef NOTRACE
OBJDIR_SUFFIX := n
endif
-include $(PWLIBDIR)/make/ptlib.mak
+include $(PTLIBDIR)/make/ptlib.mak
endif
OPAL_SRCDIR = $(OPALDIR)/src
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
