[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=33bec3b

The following commit has been merged in the master branch:
commit 33bec3b2cc71bb87ca77d9a4a82198952e1348d4
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Jan 11 21:38:40 2015 +0000

    #1024.  Add CMake support for regex.  Fixed unused variables in version.cpp
---
 config/CMakeChecks.txt |  2 ++
 config/config.h.cmake  |  3 +++
 src/version.cpp        | 17 ++++++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt
index 4320ec2..266cca1 100644
--- a/config/CMakeChecks.txt
+++ b/config/CMakeChecks.txt
@@ -148,6 +148,7 @@ check_include_file( "sys/time.h" HAVE_SYS_TIME_H )
 check_include_file( "sys/types.h" HAVE_SYS_TYPES_H )
 check_include_file( "sys/mman.h" HAVE_SYS_MMAN_H )
 check_include_file( "process.h" HAVE_PROCESS_H )
+check_include_file( "regex.h" HAVE_REGEX )
 
 check_function_exists( alarm HAVE_ALARM )
 check_function_exists( gmtime_r HAVE_GMTIME_R )
@@ -252,6 +253,7 @@ SET( EXV_SYMBOLS ENABLE_NLS
                  HAVE_WCHAR_H
                  HAVE_XMP_TOOLKIT
                  HAVE__BOOL
+                 HAVE_REGEX
                  USE_CURL
                  USE_SSH
                  PACKAGE
diff --git a/config/config.h.cmake b/config/config.h.cmake
index af37289..0d629a2 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -51,6 +51,9 @@
 /* Define to 1 if you have the <libintl.h> header file. */
 #cmakedefine EXV_HAVE_LIBINTL_H 1
 
+/* Define to 1 if you have the <regex.h> header file. */
+#cmakedefine EXV_HAVE_REGEX 1
+
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    to 0 otherwise. */
 #cmakedefine EXV_HAVE_MALLOC 1
diff --git a/src/version.cpp b/src/version.cpp
index 0594324..ad59bee 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -383,7 +383,19 @@ static void output(std::ostream& os,const exv_grep_keys_t& keys,const char* name
 
 #if EXV_HAVE__BOOL
     have_bool=1;
-#endif    
+#endif 
+
+#if  EXV_HAVE_STRINGS
+     have_strings=1;
+#endif
+
+#if  EXV_SYS_TYPES
+     have_sys_types=1;
+#endif
+
+#if  EXV_HAVE_UNISTD
+     have_unistd=1;   
+#endif
 
 #if defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW__)
     // enumerate loaded libraries and determine path to executable
@@ -487,6 +499,9 @@ static void output(std::ostream& os,const exv_grep_keys_t& keys,const char* name
     output(os,keys,"have_libz"      ,have_libz      );
     output(os,keys,"have_xmptoolkit",have_xmptoolkit);
     output(os,keys,"have_bool"      ,have_bool      );
+    output(os,keys,"have_strings"   ,have_strings   );
+    output(os,keys,"have_sys_types" ,have_sys_types );
+    output(os,keys,"have_unistd"    ,have_unistd    );
 
 #if defined(__linux__)
     dlclose(ph);

-- 
exiv2 packaging