Changeset 7425

Timestamp:

Jun 8, 2006, 3:52:10 AM (20 years ago)

Author:

rhl

Message:

Fixed --with-jpeg (no more refs to FFTW3\!)

File:

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

trunk/psLib/configure.ac

@@ -242 +242 @@
 
 dnl ------------------ libjpeg options ---------------------
+
 AC_ARG_WITH(jpeg,
 [AS_HELP_STRING(--with-jpeg=DIR,Specify location of libjpeg.)],
@@ -248 +249 @@
 AC_ARG_WITH(jpeg-include,
 [AS_HELP_STRING(--with-jpeg-include=DIR,Specify libjpeg include directory.)],
-[FFTW3_CFLAGS="-I$withval"])
+[JPEG_CFLAGS="-I$withval"])
 AC_ARG_WITH(fftw3-lib,
 [AS_HELP_STRING(--with-jpeg-lib=DIR,Specify libjpeg library directory.)],
 [JPEG_LDFLAGS="-L$withval"])
-PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${JPEG_CFLAGS}"
-PSLIB_LIBS="${PSLIB_LIBS=} $JPEG_LDFLAGS -ljpeg"
 
 dnl Store off CFLAGS/LDFLAGS so that they can be restored after tests
@@ -259 +258 @@
 TMP_LDFLAGS=${LDFLAGS}
 
-CFLAGS="${TMP_CFLAGS} ${PSLIB_CFLAGS}"
-LDFLAGS="${TMP_LDFLAGS} ${PSLIB_LIBS}"
-AC_CHECK_HEADERS([jpeglib.h],[],
+CFLAGS="${TMP_CFLAGS} ${JPEG_CFLAGS}"
+LDFLAGS="${TMP_LDFLAGS} ${JPEG_LDFLAGS}"
+
+AC_CHECK_HEADERS([jpeglib.h],[TMP_CFLAGS="$CFLAGS" # keep the change],
   [AC_MSG_ERROR([libjpeg headers not found.  Obtain libjpeg from http://www.ijg.org/ or use --with-jpeg to specify location.])]
 )
-AC_CHECK_LIB(jpeg,jpeg_CreateCompress,[],
+
+AC_CHECK_LIB(jpeg,jpeg_CreateCompress,[TMP_LDFLAGS="$LDFLAGS" # keep the change],
   [AC_MSG_ERROR([libjpeg library not found.  Obtain libjpeg from http://www.ijg.org/ or use --with-jpeg to specify location.])]
 )
-LIBS=${TMP_LIBS}
-
-dnl restore the CFLAGS/LDFLAGS
+
+dnl restore the CFLAGS/LDFLAGS in case we decide to make missing libjpeg only a warning
 CFLAGS=${TMP_CFLAGS}
 LDFLAGS=${TMP_LDFLAGS}
-
-AC_SUBST([JPEG_CFLAGS])
 
 dnl ------------------- XML2 options ---------------------