Changeset 7464

Timestamp:

Jun 9, 2006, 1:27:10 PM (20 years ago)

Author:

rhl

Message:

Fix error messages about C preprocessor failing

File:

• trunk/psLib/configure.ac (modified) (6 diffs)

trunk/psLib/configure.ac

@@ -159 +159 @@
 
 dnl Store off CFLAGS/LDFLAGS so that they can be restored after tests
+TMP_CFLAGS=${CPPFLAGS}
 TMP_CFLAGS=${CFLAGS}
 TMP_LDFLAGS=${LDFLAGS}
 
+CPPFLAGS=${PSLIB_CFLAGS}
 CFLAGS=${PSLIB_CFLAGS}
 LDFLAGS=${PSLIB_LIBS}
@@ -180 +182 @@
 
 dnl restore the CFLAGS/LDFLAGS
+CPPFLAGS=${TMP_CPPFLAGS}
 CFLAGS=${TMP_CFLAGS}
 LDFLAGS=${TMP_LDFLAGS}
@@ -200 +203 @@
 PSLIB_LIBS="${PSLIB_LIBS=} $FFTW3_LDFLAGS -lfftw3f"
 
-dnl Store off CFLAGS/LDFLAGS so that they can be restored after tests
+dnl Store off CPPFLAGS/CFLAGS/LDFLAGS so that they can be restored after tests
+TMP_CPPFLAGS=${CPPFLAGS}
 TMP_CFLAGS=${CFLAGS}
 TMP_LDFLAGS=${LDFLAGS}
 
 CFLAGS="${TMP_CFLAGS} ${PSLIB_CFLAGS}"
+CPPFLAGS="$CFLAGS"
 LDFLAGS="${TMP_LDFLAGS} ${PSLIB_LIBS}"
 AC_CHECK_HEADERS([fftw3.h],[],
@@ -215 +220 @@
 
 dnl restore the CFLAGS/LDFLAGS
+CPPFLAGS=${TMP_CPPFLAGS}
 CFLAGS=${TMP_CFLAGS}
 LDFLAGS=${TMP_LDFLAGS}
@@ -254 +260 @@
 [JPEG_LDFLAGS="-L$withval"])
 
-dnl Store off CFLAGS/LDFLAGS so that they can be restored after tests
+dnl Store off CPPFLAGS/CFLAGS/LDFLAGS so that they can be restored after tests
+TMP_CPPFLAGS=${CPPFLAGS}
 TMP_CFLAGS=${CFLAGS}
 TMP_LDFLAGS=${LDFLAGS}
 
 CFLAGS="${TMP_CFLAGS} ${JPEG_CFLAGS}"
+CPPFLAGS="$CFLAGS"
 LDFLAGS="${TMP_LDFLAGS} ${JPEG_LDFLAGS}"
 
@@ -269 +277 @@
 )
 
-dnl restore the CFLAGS/LDFLAGS
+dnl restore the CFLAGS/LDFLAGS in case we decide to make missing libjpeg only a warning
+CPPFLAGS=${TMP_CPPFLAGS}
 CFLAGS=${TMP_CFLAGS}
 LDFLAGS=${TMP_LDFLAGS}