[asterisk-commits] pcadach: branch pcadach/chan_h323-live r40198 - /team/pcadach/chan_h323-live/

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Thu Aug 17 08:59:33 2006
New Revision: 40198

URL: http://svn.digium.com/view/asterisk?rev=40198&view=rev
Log:
Fix for invalid openh323 path selection

Modified:
    team/pcadach/chan_h323-live/acinclude.m4
    team/pcadach/chan_h323-live/configure

Modified: team/pcadach/chan_h323-live/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/acinclude.m4?rev=40198&r1=40197&r2=40198&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/acinclude.m4 (original)
+++ team/pcadach/chan_h323-live/acinclude.m4 Thu Aug 17 08:59:33 2006
@@ -124,7 +124,7 @@
       else
         AC_CHECK_FILE(/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/share/pwlib/make)
         fi
       fi
     fi
@@ -145,10 +145,10 @@
 fi
 
 if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
-  PWLIBDIR="/usr/share/pwlib/"
+  PWLIBDIR="/usr/share/pwlib"
 fi
 if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
-  PWLIBDIR="/usr/local/share/pwlib/"
+  PWLIBDIR="/usr/local/share/pwlib"
 fi
 
 AC_SUBST([PWLIBDIR])
@@ -250,13 +250,16 @@
 if test "${HAS_OPENH323:-unset}" = "unset" ; then
   AC_CHECK_FILE(${PWLIBDIR}/../openh323/version.h, HAS_OPENH323=1, )
   if test "${HAS_OPENH323:-unset}" != "unset" ; then
-    OPENH323DIR="${OPENH323DIR}/../openh323"
+    OPENH323DIR="${PWLIBDIR}/../openh323"
   else
     AC_CHECK_FILE(${HOME}/openh323/include/h323.h, HAS_OPENH323=1, )
     if test "${HAS_OPENH323:-unset}" != "unset" ; then
       OPENH323DIR="${HOME}/openh323"
     else
       AC_CHECK_FILE(/usr/local/include/h323.h, HAS_OPENH323=1, )
+      if test "${HAS_OPENH323:-unset}" != "unset" ; then
+        OPENH323DIR="/usr/local/share/openh323"
+      fi
     fi
   fi
 fi

Modified: team/pcadach/chan_h323-live/configure
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure?rev=40198&r1=40197&r2=40198&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure (original)
+++ team/pcadach/chan_h323-live/configure Thu Aug 17 08:59:33 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 40032 .
+# From configure.ac Revision: 40176 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -19266,7 +19266,7 @@
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/share/pwlib/make/
+for as_dir in /usr/share/pwlib/make
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -19312,10 +19312,10 @@
 fi
 
 if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
-  PWLIBDIR="/usr/share/pwlib/"
+  PWLIBDIR="/usr/share/pwlib"
 fi
 if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
-  PWLIBDIR="/usr/local/share/pwlib/"
+  PWLIBDIR="/usr/local/share/pwlib"
 fi
 
 
@@ -19607,7 +19607,7 @@
 fi
 
   if test "${HAS_OPENH323:-unset}" != "unset" ; then
-    OPENH323DIR="${OPENH323DIR}/../openh323"
+    OPENH323DIR="${PWLIBDIR}/../openh323"
   else
     as_ac_File=`echo "ac_cv_file_${HOME}/openh323/include/h323.h" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for ${HOME}/openh323/include/h323.h" >&5
@@ -19655,6 +19655,9 @@
   HAS_OPENH323=1
 fi
 
+      if test "${HAS_OPENH323:-unset}" != "unset" ; then
+        OPENH323DIR="/usr/local/share/openh323"
+      fi
     fi
   fi
 fi