diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2009-02-18 20:11:57 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2009-02-18 20:11:57 +0000 |
| commit | c8fe75da36d72d2fdc5ba2d0aa4031e713a1fe22 (patch) | |
| tree | fd86877953d39fc69ebad3a8bb60d2f6b47635e7 /autoconf | |
| parent | 0fb9712a0ad6f997370e7804845dc6efd9fc3bce (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@177162 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'autoconf')
| -rw-r--r-- | autoconf/ast_check_pwlib.m4 | 25 | ||||
| -rw-r--r-- | autoconf/ast_prog_sed.m4 | 3 |
2 files changed, 19 insertions, 9 deletions
diff --git a/autoconf/ast_check_pwlib.m4 b/autoconf/ast_check_pwlib.m4 index 9d8339a18..f92fb2cac 100644 --- a/autoconf/ast_check_pwlib.m4 +++ b/autoconf/ast_check_pwlib.m4 @@ -103,12 +103,12 @@ if test "${HAS_PWLIB:-unset}" = "unset" ; then else AC_CHECK_HEADER(/usr/local/include/ptlib.h, HAS_PWLIB=1, ) if test "${HAS_PWLIB:-unset}" != "unset" ; then - AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin) - if test "${PTLIB_CONFIG:-unset}" = "unset" ; then - AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/share/pwlib/make) - fi + AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin$PATH_SEPARATOR/usr/local/share/pwlib/make) 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" @@ -121,9 +121,12 @@ if test "${HAS_PWLIB:-unset}" = "unset" ; then else AC_CHECK_HEADER(/usr/include/ptlib.h, HAS_PWLIB=1, ) if test "${HAS_PWLIB:-unset}" != "unset" ; then - AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make) + AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/bin$PATH_SEPARATOR/usr/share/pwlib/make) 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" @@ -188,8 +191,14 @@ fi ]) AC_DEFUN([AST_CHECK_PWLIB_VERSION], [ + if test "x$7" != "x"; then + VNAME="$7" + else + VNAME="$2_VERSION" + fi + if test "${HAS_$2:-unset}" != "unset"; then - $2_VERSION=`grep "$2_VERSION" ${$2_INCDIR}/$3 | sed -e 's/[[[:space:]]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` + $2_VERSION=`grep "$VNAME" ${$2_INCDIR}/$3 | sed -e 's/[[[:space:]]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` $2_MAJOR_VERSION=`echo ${$2_VERSION} | cut -f1 -d.` $2_MINOR_VERSION=`echo ${$2_VERSION} | cut -f2 -d.` $2_BUILD_NUMBER=`echo ${$2_VERSION} | cut -f3 -d.` diff --git a/autoconf/ast_prog_sed.m4 b/autoconf/ast_prog_sed.m4 index 283d52f55..371442a6c 100644 --- a/autoconf/ast_prog_sed.m4 +++ b/autoconf/ast_prog_sed.m4 @@ -12,7 +12,8 @@ AC_DEFUN([AST_PROG_SED], done echo "$ac_script" | sed 99q >conftest.sed $as_unset ac_script || ac_script= - _AC_PATH_PROG_FEATURE_CHECK(SED, [sed gsed], + ifdef([_AC_PATH_PROGS_FEATURE_CHECK],[],[define([_AC_PATH_PROGS_FEATURE_CHECK],defn([_AC_PATH_PROG_FEATURE_CHECK]))]) + _AC_PATH_PROGS_FEATURE_CHECK(SED, [sed gsed], [_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED], ["$ac_path_SED" -f conftest.sed])])]) SED="$ac_cv_path_SED" |