configure improvements

ChangeLog

@@ -23,6 +23,10 @@
 - added .tobuffer()/.frombuffer(), .tostring()/.fromstring() to Python binding
 - add PIL_mode_from_vips () and vips_from_PIL_mode () utility functions
 - update docs for new Python stuff
+- FIND_ macros no longer search for stuff, you have to specify prefixes if the
+  packages are not on the default path (or in $prefix). This avoids some
+  accidents on some platforms
+- configure prints a summary of optional packages found at the end
 
 25/1/08 started 7.14.0
 - bump all version numbers for new stable

TODO

@@ -1,3 +1,7 @@
+- FIND_TIFF etc. should not search so much
+
+- configure should summarize missing stuff at the end
+
 - try
 
 	libsrc/convolution$ grep -l offsets *.c

acinclude.m4

@@ -35,34 +35,24 @@ AC_MSG_CHECKING(for ZIP)
 
 # Look for zlib.h 
 if test "$ZIP_INCLUDES" = ""; then
-	zip_save_LIBS="$LIBS"
-
-	LIBS="-lz $LIBS"
-
 	# Check the standard search path
 	AC_TRY_COMPILE([#include <zlib.h>],[int a;],[
 		ZIP_INCLUDES=""
 	], [
-		# zlib.h is not in the standard search path.
+		# zlib.h is not in the standard search path, try
+		# $prefix
+		zip_save_INCLUDES="$INCLUDES"
 
-		# A whole bunch of guesses
+		INCLUDES="-I${prefix}/include $INCLUDES"
-		for dir in \
-			"${prefix}"/*/include /usr/*/include \
-			/usr/local/*/include \
-			"${prefix}"/include/* \
-			/usr/include/* /usr/local/include/* /*/include; do
-			if test -f "$dir/zlib.h"; then
-				ZIP_INCLUDES="-I$dir"
-				break
-			fi
-		done
 
-		if test "$ZIP_INCLUDES" = ""; then
+		AC_TRY_COMPILE([#include <zlib.h>],[int a;],[
-			ZIP_INCLUDES=no
+			ZIP_INCLUDES="-I${prefix}/include"
-		fi
+		], [
+			ZIP_INCLUDES="no"
+		])
+
+		INCLUDES=$zip_save_INCLUDES
 	])
-
-	LIBS="$zip_save_LIBS"
 fi
 
 # Now for the libraries
@@ -77,22 +67,15 @@ if test "$ZIP_LIBS" = ""; then
 	AC_TRY_LINK([#include <zlib.h>],[zlibVersion()], [
 		ZIP_LIBS="-lz"
 	], [
-		# libz is not in the standard search path.
+		# libz is not in the standard search path, try $prefix
 
-		# A whole bunch of guesses
+		LIBS="-L${prefix}/lib $LIBS"
-		for dir in \
-			"${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \
-			"${prefix}"/lib/* /usr/lib/* \
-			/usr/local/lib/* /*/lib; do
-			if test -d "$dir" && test "`ls $dir/libz.* 2> /dev/null`" != ""; then
-				ZIP_LIBS="-L$dir -lz"
-				break
-			fi
-		done
 
-		if test "$ZIP_LIBS" = ""; then
+		AC_TRY_LINK([#include <zlib.h>],[zlibVersion()], [
+			ZIP_LIBS="-L${prefix}/lib -lz"
+		], [
 			ZIP_LIBS=no
-		fi
+		])
 	])
 
 	LIBS="$zip_save_LIBS"
@@ -176,23 +159,19 @@ if test "$TIFF_INCLUDES" = ""; then
 	AC_TRY_COMPILE([#include <tiff.h>],[int a;],[
 		TIFF_INCLUDES=""
 	], [
-		# tiff.h is not in the standard search path.
+		# tiff.h is not in the standard search path, try
+		# $prefix
+		tiff_save_INCLUDES="$INCLUDES"
 
-		# A whole bunch of guesses
+		INCLUDES="-I${prefix}/include $INCLUDES"
-		for dir in \
-			"${prefix}"/*/include /usr/*/include \
-			/usr/local/*/include "${prefix}"/include/* \
-			/usr/include/* /usr/local/include/* \
-			/opt/include /opt/*/include /*/include; do
-			if test -f "$dir/tiff.h"; then
-				TIFF_INCLUDES="-I$dir"
-				break
-			fi
-		done
 
-		if test "$TIFF_INCLUDES" = ""; then
+		AC_TRY_COMPILE([#include <tiff.h>],[int a;],[
-			TIFF_INCLUDES=no
+			TIFF_INCLUDES="-I${prefix}/include"
-		fi
+		], [
+			TIFF_INCLUDES="no"
+		])
+
+		INCLUDES=$tiff_save_INCLUDES
 	])
 fi
 
@@ -205,26 +184,18 @@ if test "$TIFF_LIBS" = ""; then
 	INCLUDES="$TIFF_INCLUDES $INCLUDES"
 
 	# Try the standard search path first
-	AC_TRY_LINK([#include <tiff.h>],[TIFFGetVersion();], [
+	AC_TRY_LINK([#include <tiff.h>],[TIFFGetVersion()], [
 		TIFF_LIBS="-ltiff"
 	], [
-		# libtiff is not in the standard search path.
+		# libtiff is not in the standard search path, try $prefix
 
-		# A whole bunch of guesses
+		LIBS="-L${prefix}/lib $LIBS"
-		for dir in \
-			"${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \
-			"${prefix}"/lib/* /usr/lib/* \
-			/usr/local/lib/* \
-			/opt/lib /opt/*/lib /*/lib; do
-			if test -d "$dir" && test "`ls $dir/libtiff.* 2> /dev/null`" != ""; then
-				TIFF_LIBS="-L$dir -ltiff"
-				break
-			fi
-		done
 
-		if test "$TIFF_LIBS" = ""; then
+		AC_TRY_LINK([#include <tiff.h>],[TIFFGetVersion()], [
+			TIFF_LIBS="-L${prefix}/lib -ltiff"
+		], [
 			TIFF_LIBS=no
-		fi
+		])
 	])
 
 	LIBS="$tiff_save_LIBS"
@@ -302,41 +273,28 @@ JPEG_LIBS="-L$withval -ljpeg")
 
 AC_MSG_CHECKING(for JPEG)
 
-# Look for jpeg.h 
+# Look for jpeglib.h 
 if test "$JPEG_INCLUDES" = ""; then
-	jpeg_save_LIBS="$LIBS"
-
-	LIBS="-ljpeg $LIBS"
-
 	# Check the standard search path
-	AC_TRY_COMPILE([
+	AC_TRY_COMPILE([#include <stdio.h>
-		#include <stdio.h>
+		#include <jpeglib.h>],[int a;],[
-		#include <jpeglib.h>],[int a],[
 		JPEG_INCLUDES=""
 	], [
-		# jpeg.h is not in the standard search path.
+		# jpeglib.h is not in the standard search path, try
+		# $prefix
+		jpeg_save_INCLUDES="$INCLUDES"
 
-		# A whole bunch of guesses
+		INCLUDES="-I${prefix}/include $INCLUDES"
-		for dir in \
-			"${prefix}"/*/include \
-			/usr/local/include \
-			/usr/*/include \
-			/usr/local/*/include /usr/*/include \
-			"${prefix}"/include/* \
-			/usr/include/* /usr/local/include/* \
-			/opt/include /opt/*/include /*/include; do
-			if test -f "$dir/jpeglib.h"; then
-				JPEG_INCLUDES="-I$dir"
-				break
-			fi
-		done
 
-		if test "$JPEG_INCLUDES" = ""; then
+		AC_TRY_COMPILE([#include <stdio.h>
-			JPEG_INCLUDES=no
+			#include <jpeglib.h>],[int a;],[
-		fi
+			JPEG_INCLUDES="-I${prefix}/include"
+		], [
+			JPEG_INCLUDES="no"
+		])
+
+		INCLUDES=$jpeg_save_INCLUDES
 	])
-
-	LIBS="$jpeg_save_LIBS"
 fi
 
 # Now for the libraries
@@ -348,30 +306,22 @@ if test "$JPEG_LIBS" = ""; then
 	INCLUDES="$JPEG_INCLUDES $INCLUDES"
 
 	# Try the standard search path first
-	AC_TRY_LINK([
+	AC_TRY_LINK([#include <stdio.h>
-		#include <stdio.h>
+		#include <jpeglib.h>
-		#include <jpeglib.h>],[jpeg_abort((void*)0)], [
+	],[jpeg_abort((void*)0)], [
 		JPEG_LIBS="-ljpeg"
 	], [
-		# libjpeg is not in the standard search path.
+		# libjpeg is not in the standard search path, try $prefix
 
-		# A whole bunch of guesses
+		LIBS="-L${prefix}/lib $LIBS"
-		for dir in \
-			"${prefix}"/*/lib \
-			/usr/local/lib \
-			/usr/*/lib \
-			"${prefix}"/lib/* /usr/lib/* \
-			/usr/local/lib/* \
-			/opt/lib /opt/*/lib /*/lib; do
-			if test -d "$dir" && test "`ls $dir/libjpeg.* 2> /dev/null`" != ""; then
-				JPEG_LIBS="-L$dir -ljpeg"
-				break
-			fi
-		done
 
-		if test "$JPEG_LIBS" = ""; then
+		AC_TRY_LINK([#include <stdio.h>
+			#include <jpeg.h>
+		],[jpeg_abort((void*)0)], [
+			JPEG_LIBS="-L${prefix}/lib -ljpeg"
+		], [
 			JPEG_LIBS=no
-		fi
+		])
 	])
 
 	LIBS="$jpeg_save_LIBS"
@@ -451,37 +401,24 @@ AC_MSG_CHECKING(for PNG)
 
 # Look for png.h 
 if test "$PNG_INCLUDES" = ""; then
-	png_save_LIBS="$LIBS"
-
-	LIBS="-lpng $LIBS"
-
 	# Check the standard search path
-	AC_TRY_COMPILE([
+	AC_TRY_COMPILE([#include <png.h>],[int a;],[
-		#include <png.h>],[int a],[
 		PNG_INCLUDES=""
 	], [
-		# png.h is not in the standard search path.
+		# png.h is not in the standard search path, try
+		# $prefix
+		png_save_INCLUDES="$INCLUDES"
 
-		# A whole bunch of guesses
+		INCLUDES="-I${prefix}/include $INCLUDES"
-		for dir in \
-			"${prefix}"/*/include \
-			/usr/local/include \
-			/usr/*/include \
-			/usr/local/*/include /usr/*/include \
-			"${prefix}"/include/* \
-			/usr/include/* /usr/local/include/* /*/include; do
-			if test -f "$dir/png.h"; then
-				PNG_INCLUDES="-I$dir"
-				break
-			fi
-		done
 
-		if test "$PNG_INCLUDES" = ""; then
+		AC_TRY_COMPILE([#include <png.h>],[int a;],[
-			PNG_INCLUDES=no
+			PNG_INCLUDES="-I${prefix}/include"
-		fi
+		], [
+			PNG_INCLUDES="no"
+		])
+
+		INCLUDES=$png_save_INCLUDES
 	])
-
-	LIBS="$png_save_LIBS"
 fi
 
 # Now for the libraries
@@ -493,28 +430,18 @@ if test "$PNG_LIBS" = ""; then
 	INCLUDES="$PNG_INCLUDES $INCLUDES"
 
 	# Try the standard search path first
-	AC_TRY_LINK([
+	AC_TRY_LINK([#include <png.h>],[png_access_version_number()], [
-		#include <png.h>],[png_access_version_number()], [
 		PNG_LIBS="-lpng"
 	], [
-		# libpng is not in the standard search path.
+		# libpng is not in the standard search path, try $prefix
 
-		# A whole bunch of guesses
+		LIBS="-L${prefix}/lib $LIBS"
-		for dir in \
-			"${prefix}"/*/lib \
-			/usr/local/lib \
-			/usr/*/lib \
-			"${prefix}"/lib/* /usr/lib/* \
-			/usr/local/lib/* /*/lib; do
-			if test -d "$dir" && test "`ls $dir/libpng.* 2> /dev/null`" != ""; then
-				PNG_LIBS="-L$dir -lpng"
-				break
-			fi
-		done
 
-		if test "$PNG_LIBS" = ""; then
+		AC_TRY_LINK([#include <png.h>],[png_access_version_number()], [
+			PNG_LIBS="-L${prefix}/lib -lpng"
+		], [
 			PNG_LIBS=no
-		fi
+		])
 	])
 
 	LIBS="$png_save_LIBS"

configure.in

@@ -162,6 +162,7 @@ if test x"$enable_threads" != "xno"; then
   AC_DEFINE(HAVE_THREADS,1,[threaded evaluation])
   PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
   PACKAGES_USED="$PACKAGES_USED gthread-2.0"
+  enable_threads=yes
 fi
 
 # optional supporting libraries
@@ -173,8 +174,10 @@ AC_ARG_WITH([fftw3], AS_HELP_STRING([--without-fftw3], [build without fftw3 (def
 if test x"$with_fftw3" != "xno"; then
   PKG_CHECK_MODULES(FFTW3, fftw3,
     [AC_DEFINE(HAVE_FFTW3,1,[define if you have fftw3 installed.])
-    PACKAGES_USED="$PACKAGES_USED fftw3"],
+     with_fftw3=yes
-    [AC_MSG_WARN([fftw3 not found; disabling fftw support])])
+     PACKAGES_USED="$PACKAGES_USED fftw3"],
+    [AC_MSG_WARN([fftw3 not found; disabling fftw support]) 
+     with_fftw3=no])
 fi
 
 # ImageMagick ... detect attribute iteration too
@@ -190,8 +193,11 @@ fi
 if test x"$with_magick" != "xno"; then
   PKG_CHECK_MODULES(MAGICK, $with_magickpackage, 
     [AC_DEFINE(HAVE_MAGICK,1,[define if you have libMagick installed.])
-    PACKAGES_USED="$PACKAGES_USED $with_magickpackage"],
+     with_magick=yes
-    [AC_MSG_WARN([libMagick not found; disabling Magick support])])
+     PACKAGES_USED="$PACKAGES_USED $with_magickpackage"],
+    [AC_MSG_WARN([libMagick not found; disabling Magick support])
+     with_magick=no
+    ])
 fi
 
 if test x"$with_magick" != "xno"; then
@@ -213,8 +219,11 @@ AC_ARG_WITH([liboil], AS_HELP_STRING([--without-liboil], [build without liboil
 if test x"$with_liboil" != "xno"; then
   PKG_CHECK_MODULES(LIBOIL, liboil-0.3,
     [AC_DEFINE(HAVE_LIBOIL,1,[define if you have liboil-0.3 installed.])
-    PACKAGES_USED="$PACKAGES_USED liboil-0.3"],
+     with_liboil=yes
-    [AC_MSG_WARN([liboil not found; disabling liboil support])])
+     PACKAGES_USED="$PACKAGES_USED liboil-0.3"],
+    [AC_MSG_WARN([liboil not found; disabling liboil support])
+     with_liboil=no
+    ])
 fi
 
 # lcms
@@ -223,8 +232,11 @@ AC_ARG_WITH([lcms], AS_HELP_STRING([--without-lcms], [build without lcms (defaul
 if test x"$with_lcms" != "xno"; then
   PKG_CHECK_MODULES(LCMS, lcms,
     [AC_DEFINE(HAVE_LCMS,1,[define if you have lcms installed.])
-    PACKAGES_USED="$PACKAGES_USED lcms"],
+     with_lcms=yes
-    [AC_MSG_WARN([lcms not found; disabling lcms support])])
+     PACKAGES_USED="$PACKAGES_USED lcms"],
+    [AC_MSG_WARN([lcms not found; disabling lcms support])
+     with_lcms=no
+    ])
 fi
 
 # OpenEXR
@@ -234,8 +246,11 @@ AC_ARG_WITH([OpenEXR], AS_HELP_STRING([--without-OpenEXR], [build without OpenEX
 if test x"$with_OpenEXR" != "xno"; then
   PKG_CHECK_MODULES(OPENEXR, OpenEXR >= 1.2.2,
     [AC_DEFINE(HAVE_OPENEXR,1,[define if you have OpenEXR >=1.2.2 installed.])
-    PACKAGES_USED="$PACKAGES_USED OpenEXR"],
+     with_OpenEXR=yes
-    [AC_MSG_WARN([OpenEXR not found; disabling OpenEXR support])])
+     PACKAGES_USED="$PACKAGES_USED OpenEXR"],
+    [AC_MSG_WARN([OpenEXR not found; disabling OpenEXR support])
+     with_OpenEXR=no
+    ])
 fi
 
 # pangoft2
@@ -244,20 +259,44 @@ AC_ARG_WITH([pangoft2], AS_HELP_STRING([--without-pangoft2], [build without pang
 if test x"$with_pangoft2" != "xno"; then
   PKG_CHECK_MODULES(PANGOFT2, pangoft2,
     [AC_DEFINE(HAVE_PANGOFT2,1,[define if you have pangoft2 installed.])
-    PACKAGES_USED="$PACKAGES_USED pangoft2"],
+     with_pangoft2=yes
-    [AC_MSG_WARN([pangoft2 not found; disabling pangoft2 support])])
+     PACKAGES_USED="$PACKAGES_USED pangoft2"],
+    [AC_MSG_WARN([pangoft2 not found; disabling pangoft2 support])
+     with_pangoft2=no
+    ])
 fi
 
 # hmm, these don't have .pc files on ubuntu 5.10, how odd
-FIND_TIFF(,[AC_MSG_WARN([libtiff not found; disabling TIFF support])])
+FIND_TIFF(
-FIND_ZIP(,[AC_MSG_WARN([libz not found; disabling ZIP support])])
+  [with_tiff=yes],
-FIND_JPEG(,[AC_MSG_WARN([libjpeg not found; disabling JPEG support])])
+  [AC_MSG_WARN([libtiff not found; disabling TIFF support])
+   with_tiff=no
+  ])
+FIND_ZIP(
+  [with_zip=yes],
+  [AC_MSG_WARN([libz not found; disabling ZIP support])
+   with_zip=no
+  ])
+FIND_JPEG(
+  [with_jpeg=yes],
+  [AC_MSG_WARN([libjpeg not found; disabling JPEG support])
+   with_jpeg=no
+  ])
 
 # look for PNG with pkg-config ... fall back to our tester
-PKG_CHECK_MODULES(PNG, libpng, 
+AC_ARG_WITH([png], AS_HELP_STRING([--without-png], [build without libpng (default: test)]))
-  [AC_DEFINE(HAVE_PNG,1,[define if you have libpng installed.])
+
-  PACKAGES_USED="$PACKAGES_USED libpng"],
+if test x"$with_png" != "xno"; then
-  [FIND_PNG(,[AC_MSG_WARN([libpng not found; disabling PNG support])])])
+  PKG_CHECK_MODULES(PNG, libpng, 
+    [AC_DEFINE(HAVE_PNG,1,[define if you have libpng installed.])
+     with_png=yes
+     PACKAGES_USED="$PACKAGES_USED libpng"],
+    [FIND_PNG(,
+     [AC_MSG_WARN([libpng not found; disabling PNG support])
+      with_png=no
+     ])
+    ])
+fi
 
 # libexif
 AC_ARG_WITH([libexif], AS_HELP_STRING([--without-libexif], [build without libexif (default: test)]))
@@ -265,9 +304,11 @@ AC_ARG_WITH([libexif], AS_HELP_STRING([--without-libexif], [build without libexi
 if test x"$with_libexif" != "xno"; then
   PKG_CHECK_MODULES(EXIF, libexif >= 0.6,
     [AC_DEFINE(HAVE_EXIF,1,[define if you have libexif >= 0.6 installed.])
-    PACKAGES_USED="$PACKAGES_USED libexif"],
+     with_libexif=yes
+     PACKAGES_USED="$PACKAGES_USED libexif"],
     [AC_MSG_WARN([libexif >= 0.6 not found; disabling exif support])
-    with_libexif=no])
+     with_libexif=no
+    ])
 fi
 
 # some libexif packages need include <libexif/poop.h>, some just <poop.h>
@@ -289,8 +330,10 @@ AC_CHECK_HEADER(linux/videodev.h,
 
 if test x"$with_videodev" = x"yes"; then
   AC_DEFINE(HAVE_VIDEODEV,1,[have video4linux 1])
+  with_v4l=yes
 else
   AC_MSG_WARN([linux/videodev.h not functional; disabling Linux video support])
+  with_v4l=no
 fi
 
 # make python binding?
@@ -338,9 +381,11 @@ if test x"$with_cimg" != "xno"; then
   if test x"$vips_os_win32" = "xyes"; then
     CIMG_LIBS=-lstdc++
   fi
+  with_cimg=yes
 else
   AM_CONDITIONAL(WITH_CIMG, false)
   AC_MSG_WARN([disabling CImg binding])
+  with_cimg=no
 fi
 
 # Gather all up for VIPS_CFLAGS, VIPS_INCLUDES and VIPS_LIBS
@@ -410,3 +455,24 @@ AC_OUTPUT([
 	python/vipsCC/Makefile 
 	po/Makefile.in
 ])
+
+AC_MSG_RESULT([
+native win32:				$vips_os_win32
+open files in binary mode: 		$vips_binary_open
+
+evaluate with threads: 			$enable_threads
+use fftw3 for FFT: 			$with_fftw3
+Magick package: 			$with_magickpackage
+file import with libMagick: 		$with_magick
+accelerate loops with liboil: 		$with_liboil
+ICC profile support with lcms: 		$with_lcms
+file import with OpenEXR: 		$with_OpenEXR
+text rendering with pangoft2: 		$with_pangoft2
+file import/export with libpng: 	$with_png
+file import/export with libtiff:	$with_tiff
+file import/export with libjpeg:	$with_jpeg
+use libexif to load/save JPEG metadata: $with_libexif
+video4linux found: 			$with_v4l
+build Python binding: 			$with_python
+build CImg wrapper: 			$with_cimg
+])