--- configure.ac.orig	2009-04-05 13:29:54.000000000 +0300
+++ configure.ac	2009-04-05 13:49:39.000000000 +0300
@@ -540,40 +540,24 @@
 
 
 dnl ---------------------------------------------------------------------------
-dnl libexif: The CameraFilesystem can use libexif for extracting thumbnails
-dnl	     out of EXIF data. Similarly, it can extract the mtime of
-dnl	     a file. 
-dnl	     libexif is available from
-dnl	     http://www.sourceforge.net/projects/libexif
-dnl ---------------------------------------------------------------------------
-GP_CHECK_LIBRARY([LIBEXIF],[libexif],[>= 0.6.13],
-		 [libexif/exif-data.h],[exif_data_new],[
-AC_MSG_CHECKING([whether we use a version of libexif with ExifData.ifd[[]]])
-# Check for libexif version
-dnl FIXME: Use AC_CHECK_MEMBER?
-CPPFLAGS_save="$CPPFLAGS"
-CPPFLAGS="$LIBEXIF_CFLAGS"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-/* CC=$CC */
-/* CPPFLAGS=${CPPFLAGS} */
-/* LDFLAGS=${LDFLAGS} */
-#include <libexif/exif-data.h>
-#include <libexif/exif-content.h>
-]],[[
-	ExifData ed;
-	ExifContent *ec0, *ec1;
-	ec0 = &ed.ifd[0];
-	ec1 = &ed.ifd[1];
-]])], [
-   AC_DEFINE([HAVE_LIBEXIF_IFD],1,
-	     [whether we use a version of libexif with ExifData.ifd[[]]])
-   AC_MSG_RESULT([yes])
-], [
-   AC_MSG_RESULT([no])
-])
-CPPFLAGS="$CPPFLAGS_save"
-],[],[default-on],[http://www.sourceforge.net/projects/libexif])dnl
-
+dnl libexif
+dnl ---------------------------------------------------------------------------
+AC_MSG_CHECKING([Whether to enable libexif support)])
+AC_ARG_ENABLE([exif],
+	[AS_HELP_STRING([--enable-exif],
+		[Enable libexif support (default: yes)])],
+		[enable_exif=$enableval],
+		[enable_exif=yes])
+AC_MSG_RESULT($enable_exif)
+if test x${enable_exif} = "xyes" ; then
+	PKG_CHECK_MODULES([LIBEXIF], [libexif >= 0.6.13],
+	        [AC_DEFINE(HAVE_LIBEXIF,[1],[Define if libexif is available])
+		 AC_DEFINE(HAVE_LIBEXIF_IFD, [1], [Libexif comes with ExifData.ifd])
+		],
+        	[AC_MSG_ERROR([libexif not found])])
+fi
+AC_SUBST(LIBEXIF_LIBS)
+AC_SUBST(LIBEXIF_CFLAGS)
 
 dnl ---------------------------------------------------------------------------
 dnl Check libusb