[svn-commits] kpfleming: trunk r127767 - in /trunk: ./ acinclude.m4 configure configure.ac

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Thu Jul  3 11:22:02 2008
New Revision: 127767

URL: http://svn.digium.com/view/asterisk?view=rev&rev=127767
Log:
some minor fixes found while working on issue #12911 (and block the rev from 1.4 since the equivalent is already here)

Modified:
    trunk/   (props changed)
    trunk/acinclude.m4
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Modified: trunk/acinclude.m4
URL: http://svn.digium.com/view/asterisk/trunk/acinclude.m4?view=diff&rev=127767&r1=127766&r2=127767
==============================================================================
--- trunk/acinclude.m4 (original)
+++ trunk/acinclude.m4 Thu Jul  3 11:22:02 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: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=127767&r1=127766&r2=127767
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Jul  3 11:22:02 2008
@@ -1419,11 +1419,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], [])