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

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Thu Aug 17 09:09:35 2006
New Revision: 40199

URL: http://svn.digium.com/view/asterisk?rev=40199&view=rev
Log:
Additional search pathes for openh323

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=40199&r1=40198&r2=40199&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/acinclude.m4 (original)
+++ team/pcadach/chan_h323-live/acinclude.m4 Thu Aug 17 09:09:35 2006
@@ -256,9 +256,14 @@
     if test "${HAS_OPENH323:-unset}" != "unset" ; then
       OPENH323DIR="${HOME}/openh323"
     else
-      AC_CHECK_FILE(/usr/local/include/h323.h, HAS_OPENH323=1, )
+      AC_CHECK_FILE(/usr/local/include/openh323/h323.h, HAS_OPENH323=1, )
       if test "${HAS_OPENH323:-unset}" != "unset" ; then
         OPENH323DIR="/usr/local/share/openh323"
+      else
+        AC_CHECK_FILE(/usr/include/openh323/h323.h, HAS_OPENH323=1, )
+        if test "${HAS_OPENH323:-unset}" != "unset" ; then
+          OPENH323DIR="/usr/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=40199&r1=40198&r2=40199&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure (original)
+++ team/pcadach/chan_h323-live/configure Thu Aug 17 09:09:35 2006
@@ -19634,29 +19634,54 @@
     if test "${HAS_OPENH323:-unset}" != "unset" ; then
       OPENH323DIR="${HOME}/openh323"
     else
-      echo "$as_me:$LINENO: checking for /usr/local/include/h323.h" >&5
-echo $ECHO_N "checking for /usr/local/include/h323.h... $ECHO_C" >&6
-if test "${ac_cv_file__usr_local_include_h323_h+set}" = set; then
+      echo "$as_me:$LINENO: checking for /usr/local/include/openh323/h323.h" >&5
+echo $ECHO_N "checking for /usr/local/include/openh323/h323.h... $ECHO_C" >&6
+if test "${ac_cv_file__usr_local_include_openh323_h323_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   test "$cross_compiling" = yes &&
   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r "/usr/local/include/h323.h"; then
-  ac_cv_file__usr_local_include_h323_h=yes
-else
-  ac_cv_file__usr_local_include_h323_h=no
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_h323_h" >&5
-echo "${ECHO_T}$ac_cv_file__usr_local_include_h323_h" >&6
-if test $ac_cv_file__usr_local_include_h323_h = yes; then
+if test -r "/usr/local/include/openh323/h323.h"; then
+  ac_cv_file__usr_local_include_openh323_h323_h=yes
+else
+  ac_cv_file__usr_local_include_openh323_h323_h=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_openh323_h323_h" >&5
+echo "${ECHO_T}$ac_cv_file__usr_local_include_openh323_h323_h" >&6
+if test $ac_cv_file__usr_local_include_openh323_h323_h = yes; then
   HAS_OPENH323=1
 fi
 
       if test "${HAS_OPENH323:-unset}" != "unset" ; then
         OPENH323DIR="/usr/local/share/openh323"
+      else
+        echo "$as_me:$LINENO: checking for /usr/include/openh323/h323.h" >&5
+echo $ECHO_N "checking for /usr/include/openh323/h323.h... $ECHO_C" >&6
+if test "${ac_cv_file__usr_include_openh323_h323_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "/usr/include/openh323/h323.h"; then
+  ac_cv_file__usr_include_openh323_h323_h=yes
+else
+  ac_cv_file__usr_include_openh323_h323_h=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_include_openh323_h323_h" >&5
+echo "${ECHO_T}$ac_cv_file__usr_include_openh323_h323_h" >&6
+if test $ac_cv_file__usr_include_openh323_h323_h = yes; then
+  HAS_OPENH323=1
+fi
+
+        if test "${HAS_OPENH323:-unset}" != "unset" ; then
+          OPENH323DIR="/usr/share/openh323"
+        fi
       fi
     fi
   fi