From c038575b6f36586be549e00666338489e98af5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 19 Aug 2019 14:33:36 +0200 Subject: Fix FTBFS with exiv2 >= 0.27. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit a60ea26a48006072a5c41ed6ba96e1ad2d60f05a) --- configure.in.in | 4 ++++ src/imageutils/jpegcontent.cpp | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/configure.in.in b/configure.in.in index 1cdda0b..ba32728 100644 --- a/configure.in.in +++ b/configure.in.in @@ -133,7 +133,11 @@ fi # # 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" 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 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#if defined(HAVE_CONFIG_H) +#include "config.h" +#endif + // System #include #include @@ -39,8 +43,12 @@ extern "C" { #include // Exiv2 +#if defined(HAVE_EXIV2_EXIV2_HPP) +#include +#else #include #include +#endif // Local #include "imageutils/imageutils.h" -- cgit v1.2.1