aboutsummaryrefslogtreecommitdiffstats
path: root/cmakeconfig.h.in
diff options
context:
space:
mode:
authormorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>2008-07-18 12:11:08 +0000
committermorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>2008-07-18 12:11:08 +0000
commitcad614f2f00d28186a800e50b96b0973612c9fd5 (patch)
treecb10fea14dc59c479137761d8ae6406646dd72cb /cmakeconfig.h.in
parentdf13cc9761c4ce5201595bc0347999fbc7237e1f (diff)
Remove iconv/libiconv checks from *NIX builds: GLIB-2 provides iconv replacements.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25765 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'cmakeconfig.h.in')
-rw-r--r--cmakeconfig.h.in6
1 files changed, 0 insertions, 6 deletions
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 463769ed78..f8bf51a8d6 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -39,9 +39,6 @@
/* Define to use heimdal kerberos */
#cmakedefine HAVE_HEIMDAL_KERBEROS 1
-/* Define if you have the iconv() function. */
-#cmakedefine HAVE_ICONV 1
-
/* Define if inet_ntop() prototype exists */
#cmakedefine HAVE_INET_NTOP_PROTO 1
@@ -227,9 +224,6 @@
/* HTML viewer, e.g. mozilla */
#cmakedefine HTML_VIEWER
-/* Define as const if the declaration of iconv() needs const. */
-#cmakedefine ICONV_CONST 1
-
/* Define if <inttypes.h> defines PRI[doxu]64 macros */
/* Note: always defines PRI[doxu]64 macros so inttypes.h becomes useless.*/
#cmakedefine INTTYPES_H_DEFINES_FORMATS 1