diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-08-19 14:33:36 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-08-19 14:33:57 +0200 |
| commit | c038575b6f36586be549e00666338489e98af5fd (patch) | |
| tree | 0c23befba11b305403ae6af359def70405616988 | |
| parent | f921e4fe06154645640b17a08323b63d880e260a (diff) | |
| download | gwenview-c038575b6f36586be549e00666338489e98af5fd.tar.gz gwenview-c038575b6f36586be549e00666338489e98af5fd.zip | |
Fix FTBFS with exiv2 >= 0.27.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a60ea26a48006072a5c41ed6ba96e1ad2d60f05a)
| -rw-r--r-- | configure.in.in | 4 | ||||
| -rw-r--r-- | src/imageutils/jpegcontent.cpp | 8 |
2 files changed, 12 insertions, 0 deletions
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 <math.h> #include <stdio.h> @@ -39,8 +43,12 @@ extern "C" { #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" |