diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2009-03-17 20:47:31 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2009-03-17 20:47:31 +0000 |
| commit | 9dc40485f212e6adc3ff87f9bdbe1c68cddfde64 (patch) | |
| tree | 261d15df0038c3fe050d85bc494340eaed4fe551 /autoconf | |
| parent | 77b2123a99625dd3c944ebdcf169962c27a16c50 (diff) | |
Allow H.323 Plus library to be used in addition to the OpenH323 library
Chan_h323 can now be compiled against both the previously supported versions of
OpenH323 as well as the current H.323 Plus (version 1.20.2). The configure
script has been modified to look in the default install location of h323 to
hopefully help avoid using the environment variables OPENH323DIR and PWLIBDIR.
Also, the CLI command "h323 show version" has been added which indicates which
version of h323 is in use.
(closes issue #11261)
Reported by: vhatz
Patches:
asterisk-1.6.0.6-h323plus.patch uploaded by jthurman (license 614)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@182722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'autoconf')
| -rw-r--r-- | autoconf/ast_check_openh323.m4 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/autoconf/ast_check_openh323.m4 b/autoconf/ast_check_openh323.m4 index b3dfb925f..35f8a544b 100644 --- a/autoconf/ast_check_openh323.m4 +++ b/autoconf/ast_check_openh323.m4 @@ -16,19 +16,19 @@ if test "${HAS_OPENH323:-unset}" = "unset" ; then else saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} -I${HOME}/openh323/include -I${PWLIB_INCDIR}" - AC_CHECK_HEADER(${HOME}/openh323/include/h323.h, HAS_OPENH323=1, ) + AC_CHECK_HEADER(${HOME}/openh323/include/h323.h, HAS_OPENH323=1, , [#include <ptlib.h>]) CPPFLAGS="${saved_cppflags}" if test "${HAS_OPENH323:-unset}" != "unset" ; then OPENH323DIR="${HOME}/openh323" else saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} -I/usr/local/include/openh323 -I${PWLIB_INCDIR}" - AC_CHECK_HEADER(/usr/local/include/openh323/h323.h, HAS_OPENH323=1, ) + AC_CHECK_HEADER(/usr/local/include/openh323/h323.h, HAS_OPENH323=1, , [#include <ptlib.h>]) CPPFLAGS="${saved_cppflags}" if test "${HAS_OPENH323:-unset}" != "unset" ; then OPENH323DIR="/usr/local/share/openh323" OPENH323_INCDIR="/usr/local/include/openh323" - if test "x$LIB64" != "x"; then + if test "x$LIB64" != "x" && test -d "/usr/local/lib64"; then OPENH323_LIBDIR="/usr/local/lib64" else OPENH323_LIBDIR="/usr/local/lib" @@ -41,7 +41,7 @@ if test "${HAS_OPENH323:-unset}" = "unset" ; then if test "${HAS_OPENH323:-unset}" != "unset" ; then OPENH323DIR="/usr/share/openh323" OPENH323_INCDIR="/usr/include/openh323" - if test "x$LIB64" != "x"; then + if test "x$LIB64" != "x" && test -d "/usr/local/lib64"; then OPENH323_LIBDIR="/usr/lib64" else OPENH323_LIBDIR="/usr/lib" @@ -77,7 +77,12 @@ AC_DEFUN([AST_CHECK_OPENH323_BUILD], [ OPENH323_SUFFIX= prefixes="h323_${PWLIB_PLATFORM}_ h323_ openh323" for pfx in $prefixes; do + #files=`ls -l /usr/local/lib/lib${pfx}*.so* 2>/dev/null` files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 2>/dev/null` + if test -z "$files"; then + # check the default location + files=`ls -l /usr/local/lib/lib${pfx}*.so* 2>/dev/null` + fi libfile= if test -n "$files"; then for f in $files; do |