Fix up to correspond to configure.in checks.

Mon Jul  3 17:58:02 2000  Owen Taylor  <otaylor@redhat.com>

	* gutf8.c (g_utf8_get_charset_internal): Fix up
	to correspond to configure.in checks.

diff --git a/ChangeLog b/ChangeLog
index e9f1253..ab7b6a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul  3 17:58:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_get_charset_internal): Fix up
+       to correspond to configure.in checks.
+
 Mon Jul  3 17:18:19 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib.h: Comment g_get_codeset() out of the header file

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e9f1253..ab7b6a0 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Jul  3 17:58:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_get_charset_internal): Fix up
+       to correspond to configure.in checks.
+
 Mon Jul  3 17:18:19 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib.h: Comment g_get_codeset() out of the header file

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e9f1253..ab7b6a0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Jul  3 17:58:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_get_charset_internal): Fix up
+       to correspond to configure.in checks.
+
 Mon Jul  3 17:18:19 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib.h: Comment g_get_codeset() out of the header file

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index e9f1253..ab7b6a0 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Mon Jul  3 17:58:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_get_charset_internal): Fix up
+       to correspond to configure.in checks.
+
 Mon Jul  3 17:18:19 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib.h: Comment g_get_codeset() out of the header file

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e9f1253..ab7b6a0 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Jul  3 17:58:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_get_charset_internal): Fix up
+       to correspond to configure.in checks.
+
 Mon Jul  3 17:18:19 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib.h: Comment g_get_codeset() out of the header file

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e9f1253..ab7b6a0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Jul  3 17:58:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_get_charset_internal): Fix up
+       to correspond to configure.in checks.
+
 Mon Jul  3 17:18:19 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib.h: Comment g_get_codeset() out of the header file

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e9f1253..ab7b6a0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Jul  3 17:58:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_get_charset_internal): Fix up
+       to correspond to configure.in checks.
+
 Mon Jul  3 17:18:19 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib.h: Comment g_get_codeset() out of the header file

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e9f1253..ab7b6a0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Jul  3 17:58:02 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gutf8.c (g_utf8_get_charset_internal): Fix up
+       to correspond to configure.in checks.
+
 Mon Jul  3 17:18:19 2000  Owen Taylor  <otaylor@redhat.com>
 
        * glib.h: Comment g_get_codeset() out of the header file

diff --git a/glib/gutf8.c b/glib/gutf8.c
index da5364c..3220d3d 100644 (file)
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <stdlib.h>
-#ifdef HAVE_LANGINFO_H
+#ifdef HAVE_CODESET
 #include <langinfo.h>
 #endif
 #include <string.h>
@@ -297,8 +297,8 @@ g_utf8_get_charset_internal (char **a)
   if (charset && strstr (charset, "UTF-8"))
       return TRUE;
 
-#ifdef _NL_CTYPE_CODESET_NAME
-  charset = nl_langinfo (_NL_CTYPE_CODESET_NAME);
+#ifdef HAVE_CODESET
+  charset = nl_langinfo(CODESET);
   if (charset)
     {
       if (a && ! *a)
@@ -306,8 +306,10 @@ g_utf8_get_charset_internal (char **a)
       if (strcmp (charset, "UTF-8") == 0)
        return TRUE;
     }
-#elif CODESET
-  charset = nl_langinfo(CODESET);
+#endif
+  
+#if 0 /* #ifdef _NL_CTYPE_CODESET_NAME */
+  charset = nl_langinfo (_NL_CTYPE_CODESET_NAME);
   if (charset)
     {
       if (a && ! *a)
@@ -315,7 +317,7 @@ g_utf8_get_charset_internal (char **a)
       if (strcmp (charset, "UTF-8") == 0)
        return TRUE;
     }
-#endif  
+#endif
 
   if (a && ! *a) 
     *a = "US-ASCII";

diff --git a/gutf8.c b/gutf8.c
index da5364c..3220d3d 100644 (file)
--- a/gutf8.c
+++ b/gutf8.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <stdlib.h>
-#ifdef HAVE_LANGINFO_H
+#ifdef HAVE_CODESET
 #include <langinfo.h>
 #endif
 #include <string.h>
@@ -297,8 +297,8 @@ g_utf8_get_charset_internal (char **a)
   if (charset && strstr (charset, "UTF-8"))
       return TRUE;
 
-#ifdef _NL_CTYPE_CODESET_NAME
-  charset = nl_langinfo (_NL_CTYPE_CODESET_NAME);
+#ifdef HAVE_CODESET
+  charset = nl_langinfo(CODESET);
   if (charset)
     {
       if (a && ! *a)
@@ -306,8 +306,10 @@ g_utf8_get_charset_internal (char **a)
       if (strcmp (charset, "UTF-8") == 0)
        return TRUE;
     }
-#elif CODESET
-  charset = nl_langinfo(CODESET);
+#endif
+  
+#if 0 /* #ifdef _NL_CTYPE_CODESET_NAME */
+  charset = nl_langinfo (_NL_CTYPE_CODESET_NAME);
   if (charset)
     {
       if (a && ! *a)
@@ -315,7 +317,7 @@ g_utf8_get_charset_internal (char **a)
       if (strcmp (charset, "UTF-8") == 0)
        return TRUE;
     }
-#endif  
+#endif
 
   if (a && ! *a) 
     *a = "US-ASCII";