[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=30c87b5

The following commit has been merged in the master branch:
commit 30c87b598939cd55f9037a1ebbe941112d6682a4
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Sep 21 22:21:47 2016 +0000

    #1188 and #1109 Correction to r4530 and r4531 to fix cygwin build-breaker (gnu++98 required for snprintf support)
---
 CMakeLists.txt      |  8 +++++++-
 config/configure.ac | 13 ++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b315e3e..92c2efa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,13 @@ IF( MINGW OR UNIX )
                     -W
                    )
     ENDIF()
-    ADD_DEFINITIONS( -std=c++98 )
+
+    IF ( CYGWIN )
+        ADD_DEFINITIONS( -std=gnu++98 ) # to support snprintf
+    ELSE()
+        ADD_DEFINITIONS( -std=c++98 )
+    ENDIF()
+
 ENDIF( MINGW OR UNIX )
 
 IF( EXIV2_ENABLE_COMMERCIAL )
diff --git a/config/configure.ac b/config/configure.ac
index ab8f00d..e676033 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -335,9 +335,16 @@ for u in gettext msginit msgmerge msgfmt msgconv msgfilter ; do
     fi
 done
 
-# 1188      v0.26 use c++98
-# 1188      v0.27 should have an option to specify versions such as c++11
-CPPFLAGS="$CPPFLAGS -std=c++98"
+# 1188 v0.26 uses c++98
+# 1188 v0.27 should have an option to specify versions such as c++11
+case "$host_os" in
+    *cygwin*)
+        CPPFLAGS="$CPPFLAGS -std=gnu++98"  # cygwin requires gnu++98 to support snprintf
+    ;;
+    *)
+        CPPFLAGS="$CPPFLAGS -std=c++98"    # // all others use c++98
+    ;;
+esac
 
 # ---------------------------------------------------------------------------
 # Create output files.

-- 
exiv2 packaging