[svn-commits] jpeeler: branch jpeeler/bug11261 r182643 - /team/jpeeler/bug11261/autoconf/

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Tue Mar 17 13:50:48 2009
New Revision: 182643

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=182643
Log:
add support to check default location of h323 library

Modified:
    team/jpeeler/bug11261/autoconf/ast_check_openh323.m4

Modified: team/jpeeler/bug11261/autoconf/ast_check_openh323.m4
URL: http://svn.digium.com/svn-view/asterisk/team/jpeeler/bug11261/autoconf/ast_check_openh323.m4?view=diff&rev=182643&r1=182642&r2=182643
==============================================================================
--- team/jpeeler/bug11261/autoconf/ast_check_openh323.m4 (original)
+++ team/jpeeler/bug11261/autoconf/ast_check_openh323.m4 Tue Mar 17 13:50:48 2009
@@ -16,14 +16,14 @@
   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"
@@ -77,7 +77,12 @@
 		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