Check for iconv_* in -liconv as well as libiconv_* in -liconv since AIX

Mon Feb 25 23:01:53 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in acconfig.h config.h.win32.in
        glib/gconvert.c: Check for iconv_* in -liconv
        as well as libiconv_* in -liconv since AIX ships
        the system iconv in a separate library.
        Patch from Miroslaw Dobrzanski-Neumann (#72569)

diff --git a/ChangeLog b/ChangeLog
index ce3cdf2f94ef391e02285ffc9fb62451fa1e72f2..a987031ddfe0c58e547ef3c60ff46f682644f404 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb 25 23:01:53 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in acconfig.h config.h.win32.in
+       glib/gconvert.c: Check for iconv_* in -liconv
+       as well as libiconv_* in -liconv since AIX ships
+       the system iconv in a separate library.
+       Patch from Miroslaw Dobrzanski-Neumann (#72569) 
+
 Mon Feb 25 22:46:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gdebug.h: Fix trailing , in enumeration

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ce3cdf2f94ef391e02285ffc9fb62451fa1e72f2..a987031ddfe0c58e547ef3c60ff46f682644f404 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Mon Feb 25 23:01:53 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in acconfig.h config.h.win32.in
+       glib/gconvert.c: Check for iconv_* in -liconv
+       as well as libiconv_* in -liconv since AIX ships
+       the system iconv in a separate library.
+       Patch from Miroslaw Dobrzanski-Neumann (#72569) 
+
 Mon Feb 25 22:46:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gdebug.h: Fix trailing , in enumeration

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ce3cdf2f94ef391e02285ffc9fb62451fa1e72f2..a987031ddfe0c58e547ef3c60ff46f682644f404 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Mon Feb 25 23:01:53 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in acconfig.h config.h.win32.in
+       glib/gconvert.c: Check for iconv_* in -liconv
+       as well as libiconv_* in -liconv since AIX ships
+       the system iconv in a separate library.
+       Patch from Miroslaw Dobrzanski-Neumann (#72569) 
+
 Mon Feb 25 22:46:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gdebug.h: Fix trailing , in enumeration

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index ce3cdf2f94ef391e02285ffc9fb62451fa1e72f2..a987031ddfe0c58e547ef3c60ff46f682644f404 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+Mon Feb 25 23:01:53 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in acconfig.h config.h.win32.in
+       glib/gconvert.c: Check for iconv_* in -liconv
+       as well as libiconv_* in -liconv since AIX ships
+       the system iconv in a separate library.
+       Patch from Miroslaw Dobrzanski-Neumann (#72569) 
+
 Mon Feb 25 22:46:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gdebug.h: Fix trailing , in enumeration

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ce3cdf2f94ef391e02285ffc9fb62451fa1e72f2..a987031ddfe0c58e547ef3c60ff46f682644f404 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Mon Feb 25 23:01:53 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in acconfig.h config.h.win32.in
+       glib/gconvert.c: Check for iconv_* in -liconv
+       as well as libiconv_* in -liconv since AIX ships
+       the system iconv in a separate library.
+       Patch from Miroslaw Dobrzanski-Neumann (#72569) 
+
 Mon Feb 25 22:46:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gdebug.h: Fix trailing , in enumeration

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ce3cdf2f94ef391e02285ffc9fb62451fa1e72f2..a987031ddfe0c58e547ef3c60ff46f682644f404 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Mon Feb 25 23:01:53 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in acconfig.h config.h.win32.in
+       glib/gconvert.c: Check for iconv_* in -liconv
+       as well as libiconv_* in -liconv since AIX ships
+       the system iconv in a separate library.
+       Patch from Miroslaw Dobrzanski-Neumann (#72569) 
+
 Mon Feb 25 22:46:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gdebug.h: Fix trailing , in enumeration

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ce3cdf2f94ef391e02285ffc9fb62451fa1e72f2..a987031ddfe0c58e547ef3c60ff46f682644f404 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Mon Feb 25 23:01:53 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in acconfig.h config.h.win32.in
+       glib/gconvert.c: Check for iconv_* in -liconv
+       as well as libiconv_* in -liconv since AIX ships
+       the system iconv in a separate library.
+       Patch from Miroslaw Dobrzanski-Neumann (#72569) 
+
 Mon Feb 25 22:46:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gdebug.h: Fix trailing , in enumeration

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ce3cdf2f94ef391e02285ffc9fb62451fa1e72f2..a987031ddfe0c58e547ef3c60ff46f682644f404 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Mon Feb 25 23:01:53 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in acconfig.h config.h.win32.in
+       glib/gconvert.c: Check for iconv_* in -liconv
+       as well as libiconv_* in -liconv since AIX ships
+       the system iconv in a separate library.
+       Patch from Miroslaw Dobrzanski-Neumann (#72569) 
+
 Mon Feb 25 22:46:29 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gdebug.h: Fix trailing , in enumeration

diff --git a/acconfig.h b/acconfig.h
index b0f75be0ff5eb647229e49b66af0065ba2a3d35d..bbf5617ac764d1e466e2c8b9398ef00b0b5c7ecc 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -49,4 +49,5 @@
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES
 #undef SANE_MALLOC_PROTOS
-#undef USE_LIBICONV
+#undef USE_LIBICONV_GNU
+#undef USE_LIBICONV_NATIVE

diff --git a/config.h.win32.in b/config.h.win32.in
index 1b0a546eede56b45e2642cc8b2f3fbb57eb76bfc..f0c1c28b840883360532c97108dae9ae5824a579 100644 (file)
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -55,7 +55,7 @@
 #else /* _MSC_VER */
 /* #undef SANE_MALLOC_PROTOS */
 #endif /* _MSC_VER */
-#define USE_LIBICONV 1
+#define USE_LIBICONV_GNU 1
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.

diff --git a/configure.in b/configure.in
index 0783b5d1049bf4e3f0d0f9c479cd95535348a8a9..42920e794731e8ee7a3244699ce6d5c00a8fd51b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1520,32 +1520,47 @@ dnl ***********************
 dnl *** Tests for iconv ***
 dnl ***********************
 
-AC_ARG_WITH(libiconv, [ --with-libiconv          use the libiconv library ],,with_libiconv=maybe)
+AC_ARG_WITH(libiconv, [  --with-libiconv=[no/gnu/native] use the libiconv library ],,with_libiconv=maybe)
 
 found_iconv=no
-
-if test "x$with_libiconv" != "xyes" ; then
-   # 
-   # Check in the C library 
-   #
-   AC_CHECK_FUNC(iconv_open, with_libiconv=no; found_iconv=yes)
-fi
-
-if test "x$with_libiconv" != "xno" ; then
-   #
-   # Check for libiconv
-   #
-   AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=yes; found_iconv=yes)
-fi
+case $with_libiconv in
+  maybe)
+    # Check in the C library first
+    AC_CHECK_FUNC(iconv_open, with_libiconv=no; found_iconv=yes)
+    # Check if we have GNU libiconv
+    if test $found_iconv = "no"; then
+      AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=gnu; found_iconv=yes)
+    fi
+    # Check if we have a iconv in -liconv, possibly from vendor
+    if test $found_iconv = "no"; then
+      AC_CHECK_LIB(iconv, iconv_open, with_libiconv=native; found_iconv=yes)
+    fi
+    ;;
+  no)
+    AC_CHECK_FUNC(iconv_open, with_libiconv=no; found_iconv=yes)
+    ;;
+  gnu|yes)
+    AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=gnu; found_iconv=yes)
+    ;;
+  native)
+    AC_CHECK_LIB(iconv, iconv_open, with_libiconv=native; found_iconv=yes)
+    ;;
+esac
 
 if test "x$found_iconv" = "xno" ; then
    AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
 fi
 
-if test "x$with_libiconv" = "xyes" ; then
-  ICONV_LIBS="-liconv"
-  AC_DEFINE(USE_LIBICONV)
-fi
+case $with_libiconv in
+  gnu)
+    ICONV_LIBS="-liconv"
+    AC_DEFINE(USE_LIBICONV_GNU, [Using GNU libiconv])
+    ;;
+  native)
+    ICONV_LIBS="-liconv"
+    AC_DEFINE(USE_LIBICONV_NATIVE, [Using a native implementation of iconv in a separate library])
+    ;;
+esac
 AC_SUBST(ICONV_LIBS)
 
 dnl If the system doesn't define EILSEQ, we should define EILSEQ ourselves

diff --git a/glib/gconvert.c b/glib/gconvert.c
index 30332ff10b70f9b61b8a798ea4bc55b76c55150f..79cad6ba3d0391a7119a64ea5f3b6cc3002f3268 100644 (file)
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -38,11 +38,11 @@
 
 #include "glibintl.h"
 
-#if defined(USE_LIBICONV) && !defined (_LIBICONV_H)
-#error libiconv in use but included iconv.h not from libiconv
+#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
+#error GNU libiconv in use but included iconv.h not from libiconv
 #endif
-#if !defined(USE_LIBICONV) && defined (_LIBICONV_H)
-#error libiconv not in use but included iconv.h is from libiconv
+#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
+#error GNU libiconv not in use but included iconv.h is from libiconv
 #endif
 
 GQuark