From 7b105fea0a3d6028217632e830998390a1669ae2 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Tue, 15 Dec 1998 22:03:53 +0000 Subject: [PATCH] Rename AM_GNU_GETTEXT_GTK to AM_GTK_GNU_GETTEXT and AM_WITH_NLS_GTK to 1998-12-15 Martin Baulig * 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. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ acinclude.m4 | 6 +++--- configure.in | 2 +- 9 files changed, 46 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f96182cbc..414026f1ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1998-12-15 Martin Baulig + + * 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 * acinclude.m4: Provide a hacked version of the diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7f96182cbc..414026f1ef 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +1998-12-15 Martin Baulig + + * 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 * acinclude.m4: Provide a hacked version of the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7f96182cbc..414026f1ef 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +1998-12-15 Martin Baulig + + * 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 * acinclude.m4: Provide a hacked version of the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7f96182cbc..414026f1ef 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +1998-12-15 Martin Baulig + + * 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 * acinclude.m4: Provide a hacked version of the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7f96182cbc..414026f1ef 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +1998-12-15 Martin Baulig + + * 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 * acinclude.m4: Provide a hacked version of the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7f96182cbc..414026f1ef 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +1998-12-15 Martin Baulig + + * 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 * acinclude.m4: Provide a hacked version of the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7f96182cbc..414026f1ef 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +1998-12-15 Martin Baulig + + * 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 * acinclude.m4: Provide a hacked version of the diff --git a/acinclude.m4 b/acinclude.m4 index afe5197e92..295b33801b 100644 --- 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 80998124a8..4ea57e184e 100644 --- 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)