configure.in.in

diff --git a/configure.in.in b/configure.in.in

index fc75ba2..d071480 100644

--- a/configure.in.in

+++ b/configure.in.in

@@ -133,7 +133,11 @@

 #

 # libexiv2

 #

+SAVE_CXXFLAGS=$CXXFLAGS

+CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS"

 KDE_CHECK_HEADERS(exiv2/image.hpp, have_exiv2=yes, have_exiv2=no)

+KDE_CHECK_HEADERS(exiv2/exiv2.hpp)

+CXXFLAGS=$SAVE_CXXFLAGS

 if test "$have_exiv2" = "yes"; then

 	LIB_EXIV2="-lexiv2"

src/imageutils/jpegcontent.cpp

diff --git a/src/imageutils/jpegcontent.cpp b/src/imageutils/jpegcontent.cpp

index bab3b9a..02125c4 100644

--- a/src/imageutils/jpegcontent.cpp

+++ b/src/imageutils/jpegcontent.cpp

@@ -18,6 +18,10 @@

 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

 */

+#if defined(HAVE_CONFIG_H)

+#include "config.h"

+#endif

+

 // System

 #include <math.h>

 #include <stdio.h>

@@ -39,8 +43,12 @@

 #include <kdebug.h>

 // Exiv2

+#if defined(HAVE_EXIV2_EXIV2_HPP)

+#include <exiv2/exiv2.hpp>

+#else

 #include <exiv2/exif.hpp>

 #include <exiv2/image.hpp>

+#endif

 // Local

 #include "imageutils/imageutils.h"