From e0cbabec292fbc8058d98c93fcc8d3cf5b8f5d69 Mon Sep 17 00:00:00 2001
From: dscho <dscho>
Date: Thu, 29 Jan 2004 13:33:03 +0000
Subject: Honour the check for libz, libjpeg again

---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f213615..ddaec06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ fi
 if test ! -z "$HAVE_ZLIB_H"; then
 	AC_CHECK_LIB(z, deflate, , HAVE_ZLIB_H="")
 	if test ! -z "$HAVE_JPEGLIB_H" -a ! -z "$HAVE_ZLIB_H"; then
-		AC_CHECK_LIB(jpeg, jpeg_CreateCompress)
+		AC_CHECK_LIB(jpeg, jpeg_CreateCompress, , HAVE_JPEGLIB_H="")
 	fi
 fi
 if test ! -z "$HAVE_PTHREAD_H"; then
@@ -77,6 +77,8 @@ if test ! -z "$HAVE_PTHREAD_H"; then
 	AC_CHECK_LIB(pthread, pthread_mutex_lock, HAVE_LIBPTHREAD="true")
 fi
 AM_CONDITIONAL(HAVE_LIBPTHREAD, test ! -z "$HAVE_LIBPTHREAD")
+AM_CONDITIONAL(HAVE_LIBZ, test ! -z "$HAVE_ZLIB_H")
+AM_CONDITIONAL(HAVE_LIBJPEG, test ! -u "$HAVE_JPEGLIB_H")
 
 # Checks for header files.
 AC_HEADER_STDC
-- 
cgit v1.2.1