[asterisk-commits] murf: branch murf/323work r40888 - in /team/murf/323work: ./ include/asterisk/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Wed Aug 23 08:59:30 2006
New Revision: 40888

URL: http://svn.digium.com/view/asterisk?rev=40888&view=rev
Log:
Hmm, got to checkin these changes so I can update.


Modified:
    team/murf/323work/configure.ac
    team/murf/323work/include/asterisk/autoconfig.h.in

Modified: team/murf/323work/configure.ac
URL: http://svn.digium.com/view/asterisk/team/murf/323work/configure.ac?rev=40888&r1=40887&r2=40888&view=diff
==============================================================================
--- team/murf/323work/configure.ac (original)
+++ team/murf/323work/configure.ac Wed Aug 23 08:59:30 2006
@@ -908,8 +908,27 @@
 fi
 AC_SUBST(EDITLINE_LIB)
 
-AC_CHECK_HEADER([h323.h], [PBX_H323=1], [PBX_H323=0])
+CPPFLAGS=-I/usr/include/openh323
+AC_LANG_PUSH(C++)
+
+AC_TRY_COMPILE([
+#include <bits/atomicity.h>
+#include <ptlib.h>
+#include <openh323/h323.h>
+], [
+/* hello there */
+], [PBX_H323=1
+echo checking for the openh323 library... YES
+], [PBX_H323=0
+echo checking for the openh323 library... NOPE
+])
+
+AC_DEFINE_UNQUOTED(PBX_H323, "${PBX_H323}",[Define this to be one if there exists an h323.h file in /usr/include/openh323.])
+
 AC_SUBST(PBX_H323)
+
+AC_LANG_POP
+CPPFLAGS=
 
 AC_CHECK_HEADER([linux/ixjuser.h], [PBX_IXJUSER=1], [PBX_IXJUSER=0], [
 				   #include <linux/version.h>

Modified: team/murf/323work/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/murf/323work/include/asterisk/autoconfig.h.in?rev=40888&r1=40887&r2=40888&view=diff
==============================================================================
--- team/murf/323work/include/asterisk/autoconfig.h.in (original)
+++ team/murf/323work/include/asterisk/autoconfig.h.in Wed Aug 23 08:59:30 2006
@@ -483,6 +483,10 @@
 /* Define this to be the name of the CPU of your system. */
 #undef PBX_CPU
 
+/* Define this to be one if there exists an h323.h file in
+   /usr/include/openh323. */
+#undef PBX_H323
+
 /* Define this to be the name of the OS of your system. */
 #undef PBX_OS
 
@@ -512,12 +516,12 @@
    release 3. */
 #undef SETVBUF_REVERSED
 
-/* The size of `int', as computed by sizeof. */
+/* The size of a `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
+   automatically deduced at run-time.
 	STACK_DIRECTION > 0 => grows toward higher addresses
 	STACK_DIRECTION < 0 => grows toward lower addresses
 	STACK_DIRECTION = 0 => direction of growth unknown */
@@ -576,7 +580,7 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef mode_t
 
-/* Define to `long int' if <sys/types.h> does not define. */
+/* Define to `long' if <sys/types.h> does not define. */
 #undef off_t
 
 /* Define to `int' if <sys/types.h> does not define. */
@@ -585,7 +589,7 @@
 /* Define to rpl_realloc if the replacement function should be used. */
 #undef realloc
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define to `int' if <sys/types.h> doesn't define. */