Fix macros from libcharset to work with autoconf-2.5x. (From Laszlo

Fri Sep 28 19:41:32 2001 Owen Taylor <otaylor@redhat.com> * glib/libcharset/* configure.in: Fix macros from libcharset to work with autoconf-2.5x. (From Laszlo Peter.)
2025-01-11 15:06:14 +01:00 · 2001-09-28 23:44:46 +00:00 · 2001-09-28 23:44:46 +00:00 · b6d8893eb7
commit b6d8893eb7
parent 322e2b61fa
17 changed files with 128 additions and 51 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/libcharset/* configure.in: Fix macros from libcharset
+	to work with autoconf-2.5x. (From Laszlo Peter.)
+
 2001-09-27  Matthias Clasen  <matthiasc@poet.de>

 	* glib/gstring.c: Fix inline docs for g_string_prepend_unichar.
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@ -1,3 +1,8 @@
+Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/libcharset/* configure.in: Fix macros from libcharset
+	to work with autoconf-2.5x. (From Laszlo Peter.)
+
 2001-09-27  Matthias Clasen  <matthiasc@poet.de>

 	* glib/gstring.c: Fix inline docs for g_string_prepend_unichar.
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@ -1,3 +1,8 @@
+Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/libcharset/* configure.in: Fix macros from libcharset
+	to work with autoconf-2.5x. (From Laszlo Peter.)
+
 2001-09-27  Matthias Clasen  <matthiasc@poet.de>

 	* glib/gstring.c: Fix inline docs for g_string_prepend_unichar.
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@ -1,3 +1,8 @@
+Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/libcharset/* configure.in: Fix macros from libcharset
+	to work with autoconf-2.5x. (From Laszlo Peter.)
+
 2001-09-27  Matthias Clasen  <matthiasc@poet.de>

 	* glib/gstring.c: Fix inline docs for g_string_prepend_unichar.
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@ -1,3 +1,8 @@
+Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/libcharset/* configure.in: Fix macros from libcharset
+	to work with autoconf-2.5x. (From Laszlo Peter.)
+
 2001-09-27  Matthias Clasen  <matthiasc@poet.de>

 	* glib/gstring.c: Fix inline docs for g_string_prepend_unichar.
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@ -1,3 +1,8 @@
+Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/libcharset/* configure.in: Fix macros from libcharset
+	to work with autoconf-2.5x. (From Laszlo Peter.)
+
 2001-09-27  Matthias Clasen  <matthiasc@poet.de>

 	* glib/gstring.c: Fix inline docs for g_string_prepend_unichar.
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@ -1,3 +1,8 @@
+Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/libcharset/* configure.in: Fix macros from libcharset
+	to work with autoconf-2.5x. (From Laszlo Peter.)
+
 2001-09-27  Matthias Clasen  <matthiasc@poet.de>

 	* glib/gstring.c: Fix inline docs for g_string_prepend_unichar.
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@ -1,3 +1,8 @@
+Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/libcharset/* configure.in: Fix macros from libcharset
+	to work with autoconf-2.5x. (From Laszlo Peter.)
+
 2001-09-27  Matthias Clasen  <matthiasc@poet.de>

 	* glib/gstring.c: Fix inline docs for g_string_prepend_unichar.
--- a/aclibcharset.m4
+++ b/aclibcharset.m4
@ -1,47 +0,0 @@
-dnl From libcharset 1.1
-#serial 2
-
-dnl From Bruno Haible.
-
-AC_DEFUN(jm_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_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      jm_cv_langinfo_codeset=yes,
-      jm_cv_langinfo_codeset=no)
-    ])
-  if test $jm_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])
-#serial 2
-
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN(jm_GLIBC21,
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-	[
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-	],
-	ac_cv_gnu_library_2_1=yes,
-	ac_cv_gnu_library_2_1=no)
-      ]
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
--- a/configure.in
+++ b/configure.in
@ -2,7 +2,8 @@ dnl ***********************************
 dnl *** include special GLib macros ***
 dnl ***********************************
 builtin(include, acglib.m4)dnl
-builtin(include, aclibcharset.m4)dnl
+builtin(include, glib/libcharset/codeset.m4)dnl
+builtin(include, glib/libcharset/glibc21.m4)dnl

 # require autoconf 2.13
 AC_PREREQ(2.13)
--- a/docs/reference/glib/tmpl/memory.sgml
+++ b/docs/reference/glib/tmpl/memory.sgml
@ -201,6 +201,14 @@ function has been called.
@vtable: table of memory allocation routines.


+<!-- ##### FUNCTION g_mem_is_system_malloc ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
 <!-- ##### VARIABLE glib_mem_profiler_table ##### -->
 <para>

--- a/glib/libcharset/Makefile.am
+++ b/glib/libcharset/Makefile.am
@ -14,6 +14,8 @@ EXTRA_DIST = 			\
 	charset.alias		\
 	ref-add.sed		\
 	ref-del.sed		\
+	glibc21.m4		\
+	codeset.m4		\
 	update.sh		\
 	make-patch.sh

--- a/glib/libcharset/codeset.m4
+++ b/glib/libcharset/codeset.m4
@ -0,0 +1,20 @@
+#serial 2
+
+dnl From Bruno Haible.
+
+AC_DEFUN([jm_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_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      jm_cv_langinfo_codeset=yes,
+      jm_cv_langinfo_codeset=no)
+    ])
+  if test $jm_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
--- a/glib/libcharset/glibc21.m4
+++ b/glib/libcharset/glibc21.m4
@ -0,0 +1,26 @@
+#serial 2
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([jm_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2_1=yes,
+	ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)
--- a/glib/libcharset/libcharset-glib.patch
+++ b/glib/libcharset/libcharset-glib.patch
@ -30,6 +30,28 @@
        *aliases != '\0';
        aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
     if (strcmp (codeset, aliases) == 0
+--- /home/otaylor/ftp/libiconv-1.7.0.1/libcharset/m4/glibc21.m4	Sat Jun 17 14:31:21 2000
+++ glibc21.m4	Fri Sep 28 12:12:39 2001
+@@ -3,7 +3,7 @@
+ # Test for the GNU C Library, version 2.1 or newer.
+ # From Bruno Haible.
+ 
+-AC_DEFUN(jm_GLIBC21,
+AC_DEFUN([jm_GLIBC21],
+   [
+     AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+       ac_cv_gnu_library_2_1,
+--- /home/otaylor/ftp/libiconv-1.7.0.1/libcharset/m4/codeset.m4	Mon Apr  3 04:06:24 2000
+++ codeset.m4	Fri Sep 28 12:12:44 2001
+@@ -2,7 +2,7 @@
+ 
+ dnl From Bruno Haible.
+ 
+-AC_DEFUN(jm_LANGINFO_CODESET,
+AC_DEFUN([jm_LANGINFO_CODESET],
+ [
+   AC_CHECK_HEADERS(langinfo.h)
+   AC_CHECK_FUNCS(nl_langinfo)
 --- /home/otaylor/ftp/libiconv-1.7.0.1/libcharset/include/libcharset.h.in	Tue Mar 27 08:34:42 2001
 +++ libcharset.h	Wed Sep 26 21:55:40 2001
@@ -30,8 +30,8 @@
--- a/glib/libcharset/make-patch.sh
+++ b/glib/libcharset/make-patch.sh
@ -20,4 +20,8 @@ for i in localcharset.c ref-add.sin ref-del.sin ; do
  diff -u $ORIGINAL/lib/$i $i >> libcharset-glib.patch
 done

+for i in glibc21.m4 codeset.m4 ; do
+  diff -u $ORIGINAL/m4/$i $i >> libcharset-glib.patch
+done
+
 diff -u $ORIGINAL/include/libcharset.h.in libcharset.h >> libcharset-glib.patch
--- a/glib/libcharset/update.sh
+++ b/glib/libcharset/update.sh
@ -20,11 +20,12 @@ done

 cp $ORIGINAL/include/libcharset.h.in ./libcharset.h

+for i in codeset.m4 glibc21.m4 ; do
+  cp $ORIGINAL/m4/$i .
+done
+
 patch -p0 < libcharset-glib.patch

 echo "dnl From libcharset $VERSION" > ../../aclibcharset.m4

-for i in codeset.m4 glibc21.m4 ; do
-  cat $ORIGINAL/m4/$i >> ../../aclibcharset.m4
-done