Fix FTBFS with exiv2 >= 0.27.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a60ea26a48)
r14.0.x
Slávek Banko 5 years ago
parent f921e4fe06
commit c038575b6f
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -133,7 +133,11 @@ fi
# #
# libexiv2 # libexiv2
# #
SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS"
KDE_CHECK_HEADERS(exiv2/image.hpp, have_exiv2=yes, have_exiv2=no) 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 if test "$have_exiv2" = "yes"; then
LIB_EXIV2="-lexiv2" LIB_EXIV2="-lexiv2"

@ -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. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif
// System // System
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
@ -39,8 +43,12 @@ extern "C" {
#include <kdebug.h> #include <kdebug.h>
// Exiv2 // Exiv2
#if defined(HAVE_EXIV2_EXIV2_HPP)
#include <exiv2/exiv2.hpp>
#else
#include <exiv2/exif.hpp> #include <exiv2/exif.hpp>
#include <exiv2/image.hpp> #include <exiv2/image.hpp>
#endif
// Local // Local
#include "imageutils/imageutils.h" #include "imageutils/imageutils.h"

Loading…
Cancel
Save