Rename AM_GNU_GETTEXT_GTK to AM_GTK_GNU_GETTEXT and AM_WITH_NLS_GTK to

1998-12-15  Martin Baulig  <martin@home-of-linux.org>

	* acinclude.m4: Rename AM_GNU_GETTEXT_GTK to AM_GTK_GNU_GETTEXT and
	AM_WITH_NLS_GTK to AM_GTK_WITH_NLS to avoid this ugly automake
	warnings.

diff --git a/ChangeLog b/ChangeLog
index 7f96182cbc762730f5a8525bd8a549c89b29b548..414026f1efe2d0e719f3a7909a25ec9547d38e15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-12-15  Martin Baulig  <martin@home-of-linux.org>
+
+       * acinclude.m4: Rename AM_GNU_GETTEXT_GTK to AM_GTK_GNU_GETTEXT and
+       AM_WITH_NLS_GTK to AM_GTK_WITH_NLS to avoid this ugly automake
+       warnings.
+
 Tue Dec 15 16:06:15 1998  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4: Provide a hacked version of the

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7f96182cbc762730f5a8525bd8a549c89b29b548..414026f1efe2d0e719f3a7909a25ec9547d38e15 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+1998-12-15  Martin Baulig  <martin@home-of-linux.org>
+
+       * acinclude.m4: Rename AM_GNU_GETTEXT_GTK to AM_GTK_GNU_GETTEXT and
+       AM_WITH_NLS_GTK to AM_GTK_WITH_NLS to avoid this ugly automake
+       warnings.
+
 Tue Dec 15 16:06:15 1998  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4: Provide a hacked version of the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7f96182cbc762730f5a8525bd8a549c89b29b548..414026f1efe2d0e719f3a7909a25ec9547d38e15 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+1998-12-15  Martin Baulig  <martin@home-of-linux.org>
+
+       * acinclude.m4: Rename AM_GNU_GETTEXT_GTK to AM_GTK_GNU_GETTEXT and
+       AM_WITH_NLS_GTK to AM_GTK_WITH_NLS to avoid this ugly automake
+       warnings.
+
 Tue Dec 15 16:06:15 1998  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4: Provide a hacked version of the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7f96182cbc762730f5a8525bd8a549c89b29b548..414026f1efe2d0e719f3a7909a25ec9547d38e15 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+1998-12-15  Martin Baulig  <martin@home-of-linux.org>
+
+       * acinclude.m4: Rename AM_GNU_GETTEXT_GTK to AM_GTK_GNU_GETTEXT and
+       AM_WITH_NLS_GTK to AM_GTK_WITH_NLS to avoid this ugly automake
+       warnings.
+
 Tue Dec 15 16:06:15 1998  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4: Provide a hacked version of the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7f96182cbc762730f5a8525bd8a549c89b29b548..414026f1efe2d0e719f3a7909a25ec9547d38e15 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+1998-12-15  Martin Baulig  <martin@home-of-linux.org>
+
+       * acinclude.m4: Rename AM_GNU_GETTEXT_GTK to AM_GTK_GNU_GETTEXT and
+       AM_WITH_NLS_GTK to AM_GTK_WITH_NLS to avoid this ugly automake
+       warnings.
+
 Tue Dec 15 16:06:15 1998  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4: Provide a hacked version of the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7f96182cbc762730f5a8525bd8a549c89b29b548..414026f1efe2d0e719f3a7909a25ec9547d38e15 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+1998-12-15  Martin Baulig  <martin@home-of-linux.org>
+
+       * acinclude.m4: Rename AM_GNU_GETTEXT_GTK to AM_GTK_GNU_GETTEXT and
+       AM_WITH_NLS_GTK to AM_GTK_WITH_NLS to avoid this ugly automake
+       warnings.
+
 Tue Dec 15 16:06:15 1998  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4: Provide a hacked version of the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7f96182cbc762730f5a8525bd8a549c89b29b548..414026f1efe2d0e719f3a7909a25ec9547d38e15 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+1998-12-15  Martin Baulig  <martin@home-of-linux.org>
+
+       * acinclude.m4: Rename AM_GNU_GETTEXT_GTK to AM_GTK_GNU_GETTEXT and
+       AM_WITH_NLS_GTK to AM_GTK_WITH_NLS to avoid this ugly automake
+       warnings.
+
 Tue Dec 15 16:06:15 1998  Owen Taylor  <otaylor@redhat.com>
 
        * acinclude.m4: Provide a hacked version of the

diff --git a/acinclude.m4 b/acinclude.m4
index afe5197e92bc4d1be24f986db9a45f63ae311e47..295b33801b7276abfe63a4680dcce45d12fede74 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -272,7 +272,7 @@ AC_SUBST(NM)
 
 # serial 5
 
-AC_DEFUN(AM_WITH_NLS_GTK,
+AC_DEFUN(AM_GTK_WITH_NLS,
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
@@ -461,7 +461,7 @@ AC_DEFUN(AM_WITH_NLS_GTK,
     AC_SUBST(POSUB)
   ])
 
-AC_DEFUN(AM_GNU_GETTEXT_GTK,
+AC_DEFUN(AM_GTK_GNU_GETTEXT,
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
@@ -487,7 +487,7 @@ strdup __argz_count __argz_stringify __argz_next])
    fi
 
    AM_LC_MESSAGES
-   AM_WITH_NLS_GTK
+   AM_GTK_WITH_NLS
 
    if test "x$CATOBJEXT" != "x"; then
      if test "x$ALL_LINGUAS" = "x"; then

diff --git a/configure.in b/configure.in
index 80998124a8aa206ab025e173dc3c722501a28a75..4ea57e184e46bda4ab016d402d217ebafc7b77db 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -132,7 +132,7 @@ AC_SUBST(REBUILD)
 
 # i18n stuff
 ALL_LINGUAS="de pt"
-AM_GNU_GETTEXT_GTK
+AM_GTK_GNU_GETTEXT
 AC_CHECK_FUNC(gettext,
        ,
        AC_CHECK_LIB(intl, gettext)