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

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Thu Jul  3 11:24:57 2008
New Revision: 127778

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

........
r127767 | kpfleming | 2008-07-03 11:22:02 -0500 (Thu, 03 Jul 2008) | 2 lines

some minor fixes found while working on issue #12911 (and block the rev from 1.4 since the equivalent is already here)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/acinclude.m4
    branches/1.6.0/configure
    branches/1.6.0/configure.ac
    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=127778&r1=127777&r2=127778
==============================================================================
--- branches/1.6.0/acinclude.m4 (original)
+++ branches/1.6.0/acinclude.m4 Thu Jul  3 11:24:57 2008
@@ -192,7 +192,7 @@
          $1_HEADER_FOUND="1"
       else				# check for the header
          saved_cppflags="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE} $6"
+         CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
 	 AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
          CPPFLAGS="${saved_cppflags}"
       fi

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=127778&r1=127777&r2=127778
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Thu Jul  3 11:24:57 2008
@@ -1390,11 +1390,7 @@
   tonezone_extra="-lm"
 fi
 
-if test "x${DAHDI_DIR}" != "x"; then
-  tonezone_extra="${tonezone_extra} -I${DAHDI_DIR}/include"
-fi
-
-AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra}])
+AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra} ${DAHDI_INCLUDE}])
 
 AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [])
 

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=127778&r1=127777&r2=127778
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Thu Jul  3 11:24:57 2008
@@ -1157,6 +1157,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