[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=350b55a

The following commit has been merged in the master branch:
commit 350b55a81ed497068696c0d27fb07b1f67531c48
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Apr 8 14:17:42 2010 +0000

    fix Iconv const detection to compile fine with Cmake
---
 config/ConfigureChecks.cmake | 7 +++++--
 config/config.h.cmake        | 7 ++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/config/ConfigureChecks.cmake b/config/ConfigureChecks.cmake
index 1ae230d..913589f 100644
--- a/config/ConfigureChecks.cmake
+++ b/config/ConfigureChecks.cmake
@@ -1,5 +1,6 @@
 # CMake build system for exiv2 library and executables
 # Copyright 2008 by Patrick Spendrin <ps_ml at gmx.de>
+# Copyright 2010 by Gilles Caulier <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -86,8 +87,9 @@ if( ICONV_TEST )
     set( HAVE_ICONV 1 )
     message ( "================> ICONV_LIBRARIES : " ${ICONV_LIBRARIES} )
 endif( ICONV_TEST )
+
 if( ICONV_ACCEPTS_CONST_INPUT )
-    set( ICONV_CONST "const" )
+    message ( "ICONV_ACCEPTS_CONST_INPUT : yes" )
 endif( ICONV_ACCEPTS_CONST_INPUT )
 
 # checking for Header files
@@ -205,7 +207,6 @@ HAVE_VPRINTF
 HAVE_WCHAR_H
 HAVE_XMP_TOOLKIT
 HAVE__BOOL
-ICONV_CONST
 PACKAGE
 PACKAGE_BUGREPORT
 PACKAGE_NAME
@@ -216,6 +217,8 @@ PACKAGE_VERSION
 
 foreach( entry ${EXV_SYMBOLS} )
     set( EXV_${entry} ${${entry}} )
+# NOTE: to hack...
+#    message( EXV_${entry} " : " ${${entry}} )
 endforeach( entry ${EXV_SYMBOLS} )
 
 configure_file( config/config.h.cmake ${CMAKE_BINARY_DIR}/exv_conf.h )
diff --git a/config/config.h.cmake b/config/config.h.cmake
index effdc68..34995f6 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -35,7 +35,12 @@
 #endif /* !EXV_COMMERCIAL_VERSION */
 
 /* Define to `const' or to empty, depending on the second argument of `iconv'. */
-#cmakedefine EXV_ICONV_CONST const
+#cmakedefine ICONV_ACCEPTS_CONST_INPUT 1
+#if defined ICONV_ACCEPTS_CONST_INPUT
+#define EXV_ICONV_CONST "const"
+#else
+#define EXV_ICONV_CONST
+#endif
 
 /* Define to 1 if you have the <libintl.h> header file. */
 #cmakedefine EXV_HAVE_LIBINTL_H 1

-- 
exiv2 packaging