[asterisk-commits] kpfleming: branch 1.6.0 r109453 - in /branches/1.6.0: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue Mar 18 10:50:53 2008
New Revision: 109453

URL: http://svn.digium.com/view/asterisk?view=rev&rev=109453
Log:
Merged revisions 109451 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r109451 | kpfleming | 2008-03-18 10:50:29 -0500 (Tue, 18 Mar 2008) | 2 lines

ensure that dependencies on AST_C_DEFINE_CHECK symbols work properly

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/acinclude.m4
    branches/1.6.0/configure
    branches/1.6.0/include/asterisk/autoconfig.h.in

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/acinclude.m4
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/acinclude.m4?view=diff&rev=109453&r1=109452&r2=109453
==============================================================================
--- branches/1.6.0/acinclude.m4 (original)
+++ branches/1.6.0/acinclude.m4 Tue Mar 18 10:50:53 2008
@@ -92,7 +92,7 @@
 # AST_C_DEFINE_CHECK([package], [macro name], [header file], [version])
 AC_DEFUN([AST_C_DEFINE_CHECK],
 [
-    if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
+    if test "x${PBX_$1}" != "x1"; then
 	AC_MSG_CHECKING([for $2 in $3])
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${$1_DIR}" != "x"; then
@@ -118,6 +118,7 @@
 	)
 	CPPFLAGS="${saved_cppflags}"
     fi
+    AC_SUBST(PBX_$1)
 ])
 
 

Modified: branches/1.6.0/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/autoconfig.h.in?view=diff&rev=109453&r1=109452&r2=109453
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Tue Mar 18 10:50:53 2008
@@ -1178,6 +1178,9 @@
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
 
 /* Define like PROTOTYPES; this can be used by system headers. */
 #undef __PROTOTYPES