diff options
| author | IOhannes m zmölnig <zmoelnig@users.sourceforge.net> | 2006-10-16 14:49:39 +0000 |
|---|---|---|
| committer | IOhannes m zmölnig <zmoelnig@users.sourceforge.net> | 2006-10-16 14:49:39 +0000 |
| commit | a4e4e9760b8646ccbffaadf6e49b99ac867709f4 (patch) | |
| tree | 7e306c629db5f749830b4f6f9ade22b5669e6f49 /src | |
| parent | e1583a526d7d4925b96b6358f93188a7b99fc483 (diff) | |
drop INCLUDES; integrate it into CFLAGS/CPPFLAGS
svn path=/trunk/externals/zexy/; revision=6116
Diffstat (limited to 'src')
| -rw-r--r-- | src/configure.ac | 13 |
1 files changed, 8 insertions, 5 deletions
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! |