Bug 501651 – Update glib/libcharset

2008-05-20  Behdad Esfahbod  <behdad@gnome.org>

        Bug 501651 – Update glib/libcharset

        * configure.in:
        * glib/libcharset/Makefile.am:
        * glib/libcharset/README:
        * glib/libcharset/codeset.m4:
        * glib/libcharset/config.charset:
        * glib/libcharset/glibc21.m4:
        * glib/libcharset/libcharset-glib.patch:
        * glib/libcharset/libcharset.h:
        * glib/libcharset/localcharset.c (_g_locale_get_charset_aliases),
        (_g_locale_charset_raw):
        * glib/libcharset/localcharset.h:
        * glib/libcharset/make-patch.sh:
        * glib/libcharset/ref-add.sin:
        * glib/libcharset/ref-del.sin:
        * glib/libcharset/update.sh:
        Update libcharset to the one shipped with libiconv-0.12.


svn path=/trunk/; revision=6921

ChangeLog

@@ -1,3 +1,24 @@
+2008-05-20  Behdad Esfahbod  <behdad@gnome.org>
+
+	Bug 501651 – Update glib/libcharset
+
+	* configure.in:
+	* glib/libcharset/Makefile.am:
+	* glib/libcharset/README:
+	* glib/libcharset/codeset.m4:
+	* glib/libcharset/config.charset:
+	* glib/libcharset/glibc21.m4:
+	* glib/libcharset/libcharset-glib.patch:
+	* glib/libcharset/libcharset.h:
+	* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases),
+	(_g_locale_charset_raw):
+	* glib/libcharset/localcharset.h:
+	* glib/libcharset/make-patch.sh:
+	* glib/libcharset/ref-add.sin:
+	* glib/libcharset/ref-del.sin:
+	* glib/libcharset/update.sh:
+	Update libcharset to the one shipped with libiconv-0.12.
+
 2008-05-20  Behdad Esfahbod  <behdad@gnome.org>
 
 	Bug 459905 – Bug in wcwidth data

configure.in

@@ -401,7 +401,7 @@ else
   fi
 fi
 
-jm_GLIBC21
+gl_GLIBC21
 AC_ARG_ENABLE(iconv-cache, 
               [AC_HELP_STRING([--enable-iconv-cache=@<:@yes/no/auto@:>@],
                               [cache iconv descriptors [default=auto]])],,
@@ -839,8 +839,8 @@ AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f
 #endif])
 
 # Checks for libcharset
-jm_LANGINFO_CODESET
-jm_GLIBC21
+AM_LANGINFO_CODESET
+gl_GLIBC21
 AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
 AC_CHECK_FUNCS(setlocale)
 

glib/libcharset/Makefile.am

@@ -8,6 +8,7 @@ noinst_LTLIBRARIES = libcharset.la
 
 libcharset_la_SOURCES =    	\
 	libcharset.h		\
+	localcharset.h		\
 	localcharset.c
 
 EXTRA_DIST += 			\

glib/libcharset/README

@@ -17,6 +17,11 @@ below.
 Owen Taylor
 26 September 2001
 
+Updated to libiconv-1.12.
+
+Behdad Esfahbod
+20 May 2008
+
 ====
 
 /* Determine a canonical name for the current locale's character encoding.

glib/libcharset/codeset.m4

@@ -1,19 +1,20 @@
-#serial 2
+# codeset.m4 serial AM1 (gettext-0.10.40)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
-AC_DEFUN([jm_LANGINFO_CODESET],
+AC_DEFUN([AM_LANGINFO_CODESET],
 [
-  AC_CHECK_HEADERS(langinfo.h)
-  AC_CHECK_FUNCS(nl_langinfo)
-
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], jm_cv_langinfo_codeset,
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
     [AC_TRY_LINK([#include <langinfo.h>],
       [char* cs = nl_langinfo(CODESET);],
-      jm_cv_langinfo_codeset=yes,
-      jm_cv_langinfo_codeset=no)
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
     ])
-  if test $jm_cv_langinfo_codeset = yes; then
+  if test $am_cv_langinfo_codeset = yes; then
     AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
       [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
   fi