From a4e4e9760b8646ccbffaadf6e49b99ac867709f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?=
 <zmoelnig@users.sourceforge.net>
Date: Mon, 16 Oct 2006 14:49:39 +0000
Subject: drop INCLUDES; integrate it into CFLAGS/CPPFLAGS

svn path=/trunk/externals/zexy/; revision=6116
---
 src/configure.ac | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/configure.ac b/src/configure.ac
index 483e46e..5b40f8f 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -77,6 +77,11 @@ then
  done
 fi
 
+
+CFLAGS="${INCLUDES} ${CFLAGS}"
+CPPFLAGS="${INCLUDES} ${CPPFLAGS}"
+INCLUDES=""
+
 dnl Checks for libraries.
 dnl Replace `main' with a function in -lc:
 AC_CHECK_LIB(c, main)
@@ -194,7 +199,7 @@ int main(){
   return 0;
 }
 EOF
-  if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1
+  if $CC $CFLAGS -o conftest.o conftest.c > /dev/null 2>&1
   then
    PD_VERSION=`./conftest.o`
   else
@@ -238,7 +243,7 @@ int main(){
 }
 EOF
 
-  if $CC $INCLUDES $DFLAGS -o conftest.o conftest.c > /dev/null 2>&1
+  if $CC $CFLAGS $LDFLAGS -o conftest.o conftest.c > /dev/null 2>&1
   then
    LIBRARY_VERSION=$(./conftest.o)
    echo "$LIBRARY_VERSION"
@@ -368,7 +373,7 @@ int main(){
 }
 EOF
 
-   if $CC $INCLUDES -o conftest.o conftest.c > /dev/null 2>&1
+   if $CC $CFLAGS -o conftest.o conftest.c > /dev/null 2>&1
    then
      AC_DEFINE([Z_WANT_LPT])
      if test "x$have_ppdev" = "xyes"
@@ -386,8 +391,6 @@ else
 fi
 
 
-CFLAGS="${INCLUDES} ${CFLAGS}"
-INCLUDES=""
 AC_CHECK_HEADERS(m_pd.h, , 
 	cat config.log
 	AC_ERROR([m_pd.h is desperately needed!
-- 
cgit v1.2.1