Index: configure.in
===================================================================
RCS file: /cvs/gnome/gthumb/configure.in,v
retrieving revision 1.121
diff -r1.121 configure.in
34d33
< LIBEXIF_0_5_REQUIRED=0.5.12
68a68
>         libexif >= $LIBEXIF_REQUIRED                    \
85a86
>         libexif >= $LIBEXIF_REQUIRED                    \
98a100,103
> # 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])
> 
> 
102,108c107,108
< 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()
110,112c110,112
<    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 ***])])
114,116c114,116
<    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.)])
118c118
<    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])
120,126c120,121
<    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)
222,241d216
< # 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
< 
< #
253,255c228
<    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
360d332
<     	Have libexif:             ${HAVE_EXIF}
362d333
< 	Have libjpeg:             ${HAVE_JPEG}
