From 27e82e2ee03e30aa120d18e457a41ebfb3398e16 Mon Sep 17 00:00:00 2001 From: jpeeler Date: Wed, 18 Feb 2009 20:15:37 +0000 Subject: Merged revisions 177162 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r177162 | jpeeler | 2009-02-18 14:11:57 -0600 (Wed, 18 Feb 2009) | 14 lines Modify h323 to build against PTLib as well as the older PWLib Several changes in PTLib have occurred requiring build time detection. Changes accounted for include the library name change, config option change, install location change, and a boolean type change which is handled by ast_ptlib.h. Also, the sed check has been modified to properly work with autoconf >= 2.62. (closes issue #14224) Reported by: bergolth Patches: asterisk-autoconf-sed.patch uploaded by bergolth (license 661) asterisk-pwlib-v3.patch uploaded by bergolth (license 661) Tested by: jpeeler ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@177163 f38db490-d61c-443f-a65b-d21fe96a405b --- configure | 75 ++++++++++++++++++++++----------------------------------------- 1 file changed, 26 insertions(+), 49 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 970ede122..5918286ff 100755 --- a/configure +++ b/configure @@ -6127,6 +6127,7 @@ else done echo "$ac_script" | sed 99q >conftest.sed $as_unset ac_script || ac_script= + # Extract the first word of "sed gsed" to use in msg output if test -z "$SED"; then set dummy sed gsed; ac_prog_name=$2 @@ -40875,7 +40876,7 @@ else ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/local/bin +for as_dir in /usr/local/bin$PATH_SEPARATOR/usr/local/share/pwlib/make do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -40902,50 +40903,11 @@ echo "${ECHO_T}no" >&6; } fi - if test "${PTLIB_CONFIG:-unset}" = "unset" ; then - # Extract the first word of "ptlib-config", so it can be a program name with args. -set dummy ptlib-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_PTLIB_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PTLIB_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PTLIB_CONFIG="$PTLIB_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/local/share/pwlib/make -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_PTLIB_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 -PTLIB_CONFIG=$ac_cv_path_PTLIB_CONFIG -if test -n "$PTLIB_CONFIG"; then - { echo "$as_me:$LINENO: result: $PTLIB_CONFIG" >&5 -echo "${ECHO_T}$PTLIB_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - fi PWLIB_INCDIR="/usr/local/include" - PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir` + PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null` + if test "${PWLIB_LIBDIR:-unset}" = "unset"; then + PWLIB_LIBDIR=`${PTLIB_CONFIG} --ptlibdir 2>/dev/null` + fi if test "${PWLIB_LIBDIR:-unset}" = "unset"; then if test "x$LIB64" != "x"; then PWLIB_LIBDIR="/usr/local/lib64" @@ -41105,7 +41067,7 @@ else ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/share/pwlib/make +for as_dir in /usr/bin$PATH_SEPARATOR/usr/share/pwlib/make do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -41133,7 +41095,10 @@ fi PWLIB_INCDIR="/usr/include" - PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir` + PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null` + if test "${PWLIB_LIBDIR:-unset}" = "unset"; then + PWLIB_LIBDIR=`${PTLIB_CONFIG} --ptlibdir 2>/dev/null` + fi if test "${PWLIB_LIBDIR:-unset}" = "unset"; then if test "x$LIB64" != "x"; then PWLIB_LIBDIR="/usr/lib64" @@ -41202,8 +41167,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "xP[WT]LIB_VERSION" != "x"; then + VNAME="P[WT]LIB_VERSION" + else + VNAME="PWLIB_VERSION" + fi + if test "${HAS_PWLIB:-unset}" != "unset"; then - PWLIB_VERSION=`grep "PWLIB_VERSION" ${PWLIB_INCDIR}/ptbuildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` + PWLIB_VERSION=`grep "$VNAME" ${PWLIB_INCDIR}/ptbuildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` PWLIB_MAJOR_VERSION=`echo ${PWLIB_VERSION} | cut -f1 -d.` PWLIB_MINOR_VERSION=`echo ${PWLIB_VERSION} | cut -f2 -d.` PWLIB_BUILD_NUMBER=`echo ${PWLIB_VERSION} | cut -f3 -d.` @@ -41344,7 +41315,7 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -BOOL q = PTime::IsDaylightSavings(); +int q = (int) PTime::IsDaylightSavings(); ; return 0; } @@ -42150,8 +42121,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "x" != "x"; then + VNAME="" + else + VNAME="OPENH323_VERSION" + fi + if test "${HAS_OPENH323:-unset}" != "unset"; then - OPENH323_VERSION=`grep "OPENH323_VERSION" ${OPENH323_INCDIR}/openh323buildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` + OPENH323_VERSION=`grep "$VNAME" ${OPENH323_INCDIR}/openh323buildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` OPENH323_MAJOR_VERSION=`echo ${OPENH323_VERSION} | cut -f1 -d.` OPENH323_MINOR_VERSION=`echo ${OPENH323_VERSION} | cut -f2 -d.` OPENH323_BUILD_NUMBER=`echo ${OPENH323_VERSION} | cut -f3 -d.` -- cgit v1.2.3