Changeset 7452

Timestamp:

Jun 9, 2006, 11:35:31 AM (20 years ago)

Author:

rhl

Message:

jpeg AGAIN. Grrr. Put jpeg arguments into PSLIB_*

File:

• trunk/psLib/configure.ac (modified) (1 diff)

trunk/psLib/configure.ac

@@ -261 +261 @@
 LDFLAGS="${TMP_LDFLAGS} ${JPEG_LDFLAGS}"
 
-AC_CHECK_HEADERS([jpeglib.h],[TMP_CFLAGS="$CFLAGS" # keep the change],
+AC_CHECK_HEADERS([jpeglib.h],[PSLIB_CFLAGS="$PSLIB_CFLAGS $JPEG_CFLAGS"],
   [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,[TMP_LDFLAGS="$LDFLAGS" # keep the change],
+AC_CHECK_LIB(jpeg,jpeg_CreateCompress,[PSLIB_LIBS="$PSLIB_LIBS $JPEG_LDFLAGS -ljpeg"],
   [AC_MSG_ERROR([libjpeg library not found.  Obtain libjpeg from http://www.ijg.org/ or use --with-jpeg to specify location.])]
 )
 
-dnl restore the CFLAGS/LDFLAGS in case we decide to make missing libjpeg only a warning
+dnl restore the CFLAGS/LDFLAGS
 CFLAGS=${TMP_CFLAGS}
 LDFLAGS=${TMP_LDFLAGS}