[asterisk-commits] kpfleming: branch 1.4 r127754 - in /branches/1.4: ./ main/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Thu Jul  3 11:12:58 2008
New Revision: 127754

URL: http://svn.digium.com/view/asterisk?view=rev&rev=127754
Log:
ensure that DAHDI_INCLUDE and ZAPTEL_INCLUDE are added in all the places needed

improve AST_EXT_LIB_CHECK to accept (and remember) additional CFLAGS data like it does in trunk already

(closes issue #12911)
Reported by: tzafrir


Modified:
    branches/1.4/acinclude.m4
    branches/1.4/configure
    branches/1.4/configure.ac
    branches/1.4/main/Makefile

Modified: branches/1.4/acinclude.m4
URL: http://svn.digium.com/view/asterisk/branches/1.4/acinclude.m4?view=diff&rev=127754&r1=127753&r2=127754
==============================================================================
--- branches/1.4/acinclude.m4 (original)
+++ branches/1.4/acinclude.m4 Thu Jul  3 11:12:58 2008
@@ -42,7 +42,7 @@
 AC_SUBST([PBX_$1])
 ])
 
-# AST_EXT_LIB_CHECK([package symbol name], [package library name], [function to check], [package header], [additional LIB data])
+# AST_EXT_LIB_CHECK([package symbol name], [package library name], [function to check], [package header], [additional LIB data], [additional INCLUDE data])
 
 AC_DEFUN([AST_EXT_LIB_CHECK],
 [
@@ -63,17 +63,14 @@
       if test "x${$1_DIR}" != "x"; then
          $1_LIB="${pbxlibdir} ${$1_LIB}"
 	 $1_INCLUDE="-I${$1_DIR}/include"
-	 saved_cppflags="${CPPFLAGS}"
-	 CPPFLAGS="${CPPFLAGS} -I${$1_DIR}/include"
-	 if test "x$4" != "x" ; then
-	    AC_CHECK_HEADER([${$1_DIR}/include/$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
-	 fi
-	 CPPFLAGS="${saved_cppflags}"
-      else
-	 if test "x$4" != "x" ; then
-            AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
-	 fi
       fi
+      $1_INCLUDE="${$1_INCLUDE} $6"
+      saved_cppflags="${CPPFLAGS}"
+      CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
+      if test "x$4" != "x" ; then
+         AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
+      fi
+      CPPFLAGS="${saved_cppflags}"
       if test "x${$1_HEADER_FOUND}" = "x0" ; then
          if test -n "${$1_MANDATORY}" ;
          then

Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=127754&r1=127753&r2=127754
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Thu Jul  3 11:12:58 2008
@@ -1361,12 +1361,12 @@
 if test "${PBX_DAHDI}" = "1" || test "${USE_ZAPTEL}" = "no"; then
   tonezone_dir="dahdi"
    if test "x${DAHDI_DIR}" != "x"; then
-      tonezone_extra="${tonezone_extra} -I${DAHDI_DIR}/include"
+      tonezone_extra="${tonezone_extra} ${DAHDI_INCLUDE}"
    fi
 else
   tonezone_dir="zaptel"
    if test "x${ZAPTEL_DIR}" != "x"; then
-      tonezone_extra="${tonezone_extra} -I${ZAPTEL_DIR}/include"
+      tonezone_extra="${tonezone_extra} ${ZAPTEL_INCLUDE}"
    fi
 fi
 

Modified: branches/1.4/main/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/Makefile?view=diff&rev=127754&r1=127753&r2=127754
==============================================================================
--- branches/1.4/main/Makefile (original)
+++ branches/1.4/main/Makefile Thu Jul  3 11:12:58 2008
@@ -121,8 +121,7 @@
 	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o
 	rm ast_expr2.o ast_expr2f.o 
 
-channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
-asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
+asterisk.o channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) $(DAHDI_INCLUDE)
 
 stdtime/localtime.o: ASTCFLAGS+=$(AST_NO_STRICT_OVERFLOW)