From: Peter Kümmel <syntheticpp@gmx.net>
Date: Mon, 14 Aug 2006 16:38:04 +0000 (+0000)
Subject: check for ICONV_CONST
X-Git-Tag: 1.6.10~12822
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d308909bee3611e1c1de2cbc12bccdf1717e50a0;p=features.git

check for ICONV_CONST

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14675 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 1974b22fdc..c6b924ce12 100644
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -115,6 +115,15 @@ check_cxx_source_compiles(
 	"
 CXX_GLOBAL_CSTD)
 
+check_cxx_source_compiles(
+	"
+	#include <iconv.h>
+	// this declaration will fail when there already exists a non const char** version which returns size_t
+	double iconv(iconv_t cd,  char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
+	int main() { return 0; }
+	"
+HAVE_ICONV_CONST)
+
 set(PACKAGE lyx)
 set(PACKAGE_VERSION 1.5.0svn)
 
diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 71d8cc5c24..1fdceebf2d 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -93,6 +93,12 @@
 #cmakedefine HAVE_ASPELL_ASPELL_H 1
 #cmakedefine HAVE_ASPELL_H 1
 
+#cmakedefine HAVE_ICONV_CONST 1
+#ifdef HAVE_ICONV_CONST
+#define ICONV_CONST const
+#else
+#define ICONV_CONST
+#endif
 
 #cmakedefine PACKAGE "${PACKAGE}"
 #cmakedefine PACKAGE_VERSION ${PACKAGE_VERSION}