Index: configure.in
===================================================================
RCS file: /cvs/gnome/gthumb/configure.in,v
retrieving revision 1.121.2.1
diff -u -r1.121.2.1 configure.in
--- configure.in	6 Oct 2006 15:59:58 -0000	1.121.2.1
+++ configure.in	6 Oct 2006 16:55:37 -0000
@@ -31,7 +31,6 @@
 LIBGNOMEPRINTUI_REQUIRED=2.6.0
 LIBBONOBO_REQUIRED=2.6.0
 LIBBONOBOUI_REQUIRED=2.6.0
-LIBEXIF_0_5_REQUIRED=0.5.12
 LIBEXIF_REQUIRED=0.6.9
 LIBIPTCDATA_REQUIRED=0.2.1
 LIBGPHOTO_REQUIRED=2.1.3
@@ -66,6 +65,7 @@
 	libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED	\
 	gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED		\
 	gnome-vfs-module-2.0				\
+        libexif >= $LIBEXIF_REQUIRED                    \
 	libxml-2.0 >= $LIBXML_REQUIRED			\
 	libglade-2.0 >= $LIBGLADE_REQUIRED		\
 	libgnomeprint-2.2 >= $LIBGNOMEPRINT_REQUIRED	\
@@ -83,6 +83,7 @@
 	libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED	\
 	gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED		\
 	gnome-vfs-module-2.0				\
+        libexif >= $LIBEXIF_REQUIRED                    \
 	libxml-2.0 >= $LIBXML_REQUIRED			\
 	libglade-2.0 >= $LIBGLADE_REQUIRED		\
 	libgnomeprint-2.2 >= $LIBGNOMEPRINT_REQUIRED	\
@@ -96,34 +97,28 @@
 AC_PROG_CPP
 
 
+# This can be removed once we've cleaned out all the "#ifdef HAVE_LIBEXIF"s
+AC_DEFINE(HAVE_LIBEXIF, 1, [Define to 1 if we have libexif support])
+
+
 # 
 # Checks for libjpeg
 # 
-AC_ARG_ENABLE([jpeg],
-              [AC_HELP_STRING([--disable-jpeg],[disable support for jpeg])],,
-              [enable_jpeg=yes])
-
-if test x$enable_jpeg = xyes ; then
-   AC_MSG_CHECKING(JPEG Support)
-   AC_MSG_RESULT()
+AC_MSG_CHECKING(JPEG Support)
+AC_MSG_RESULT()
 
-   AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
-                [AC_CHECK_HEADER(jpeglib.h,,[AC_MSG_ERROR([*** JPEG headers not found ***])])],
-                [AC_MSG_ERROR([*** JPEG library not found ***])])
+AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+             [AC_CHECK_HEADER(jpeglib.h,,[AC_MSG_ERROR([*** JPEG headers not found ***])])],
+             [AC_MSG_ERROR([*** JPEG library not found ***])])
 
-   AC_CHECK_LIB(jpeg, jpeg_simple_progression,
-                [AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1, [Define to 1 if libjpeg supports progressive JPEG.])],
-                [AC_MSG_WARN(JPEG library does not support progressive saving.)])
+AC_CHECK_LIB(jpeg, jpeg_simple_progression,
+             [AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1, [Define to 1 if libjpeg supports progressive JPEG.])],
+             [AC_MSG_WARN(JPEG library does not support progressive saving.)])
 
-   AC_DEFINE(HAVE_LIBJPEG, 1, [Define to 1 if libjpeg support is included])
+AC_DEFINE(HAVE_LIBJPEG, 1, [Define to 1 if libjpeg support is included])
 
-   JPEG_LIBS='-ljpeg -lm -lz'
-   AC_SUBST(JPEG_LIBS)
-
-   HAVE_JPEG=yes
-else
-   HAVE_JPEG=no
-fi
+JPEG_LIBS='-ljpeg -lm -lz'
+AC_SUBST(JPEG_LIBS)
 
 
 # 
@@ -219,26 +214,6 @@
 AC_SUBST(XF86GAMMA_LIBS)
 
 #
-# Checks for libexif
-#
-AC_ARG_ENABLE([exif],
-              [AC_HELP_STRING([--disable-exif],[disable support for libexif])],,
-              [enable_exif=yes])
-
-HAVE_EXIF=no
-if test x$enable_exif = xyes ; then
-   PKG_CHECK_MODULES(EXIF, libexif >= $LIBEXIF_REQUIRED,
-                     AC_DEFINE(HAVE_LIBEXIF, 1, [Define to 1 if we have libexif support])
-                     HAVE_EXIF=yes,
-                     [AC_MSG_RESULT(no)
-                      PKG_CHECK_MODULES(EXIF, libexif >= $LIBEXIF_0_5_REQUIRED,
-                                        [AC_DEFINE(HAVE_LIBEXIF_0_5, 1, [Using libexif 0.5])]
-                                        HAVE_EXIF=[yes],
-                                        HAVE_EXIF=[no])
-                     ])
-fi
-
-#
 # Checks for libiptcdata
 #
 AC_ARG_ENABLE([iptcdata],
@@ -250,9 +225,7 @@
    AC_MSG_CHECKING(IPTC Data Support)
    IPTCDATA_LIBS=""
    IPTCDATA_CFLAGS=""
-   if test "x$EXIF_LIBS" = "x"; then
-     HAVE_IPTC="no iptc support without libexif"
-   elif pkg-config --atleast-version=$LIBIPTCDATA_REQUIRED libiptcdata; then
+   if pkg-config --atleast-version=$LIBIPTCDATA_REQUIRED libiptcdata; then
      HAVE_IPTC="yes"
      IPTCDATA_LIBS=`pkg-config --libs libiptcdata`
      IPTCDATA_CFLAGS=`pkg-config --cflags libiptcdata`
@@ -357,9 +330,7 @@
     	Have XRender:             ${HAVE_RENDER}
     	Have XTest:               ${have_xtest}
 	Have XF86VidModeSetGamma: ${have_xf86gamma}
-    	Have libexif:             ${HAVE_EXIF}
     	Have libiptcdata:         ${HAVE_IPTC}
-	Have libjpeg:             ${HAVE_JPEG}
 	Have libtiff:             ${HAVE_TIFF}
 	Have libgphoto:           ${HAVE_GPHOTO2}
 
