Changeset 7440

Timestamp:

Jun 8, 2006, 11:42:19 AM (20 years ago)

Author:

rhl

Message:

No need to probe for libjpeg now that it's properly handled by pslib's configure.ac

File:

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

trunk/psphot/configure.ac

@@ -31 +31 @@
 )
 
-dnl ------------------ libjpeg options ---------------------
-
-AC_ARG_WITH(jpeg,
-[AS_HELP_STRING(--with-jpeg=DIR,Specify location of libjpeg.)],
-[JPEG_CFLAGS="-I$withval/include"
- JPEG_LDFLAGS="-L$withval/lib"])
-AC_ARG_WITH(jpeg-include,
-[AS_HELP_STRING(--with-jpeg-include=DIR,Specify libjpeg include directory.)],
-[JPEG_CFLAGS="-I$withval"])
-AC_ARG_WITH(fftw3-lib,
-[AS_HELP_STRING(--with-jpeg-lib=DIR,Specify libjpeg library directory.)],
-[JPEG_LDFLAGS="-L$withval"])
-
-dnl Store off CFLAGS/LDFLAGS so that they can be restored after tests
-TMP_CFLAGS=${CFLAGS}
-TMP_LDFLAGS=${LDFLAGS}
-
-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,[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.])]
-)
-
-dnl restore the CFLAGS/LDFLAGS in case we decide to make missing libjpeg only a warning
-CFLAGS=${TMP_CFLAGS}
-LDFLAGS=${TMP_LDFLAGS}
-
 dnl ------------------------------------------------------------