From eda750195e488cfb9ff22e083f127a6c2d5d3682 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Wed, 28 Jan 2004 02:50:23 +0000 Subject: [PATCH] quote AC_DEFUN macro names so automake 1.8 won't whine at us. Tue Jan 27 18:45:47 2004 Manish Singh * m4macros/gtk-2.0.m4: quote AC_DEFUN macro names so automake 1.8 won't whine at us. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ m4macros/gtk-2.0.m4 | 2 +- 6 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e70a1ff96b..a5c04cf6c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 27 18:45:47 2004 Manish Singh + + * m4macros/gtk-2.0.m4: quote AC_DEFUN macro names so automake + 1.8 won't whine at us. + 2004-01-28 Tor Lillqvist * gdk/win32/gdkevents-win32.c (synthesize_leave_event, @@ -25,6 +30,7 @@ * acconfig.h: Remove HAVE_WINSOCK_H, not used any longer. +>>>>>>> 1.4000.2.347 Sat Jan 3 11:39:42 2004 Manish Singh * gtk/gtkclipboard.c: Update freedesktop.org clipboard doc link. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e70a1ff96b..a5c04cf6c5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Jan 27 18:45:47 2004 Manish Singh + + * m4macros/gtk-2.0.m4: quote AC_DEFUN macro names so automake + 1.8 won't whine at us. + 2004-01-28 Tor Lillqvist * gdk/win32/gdkevents-win32.c (synthesize_leave_event, @@ -25,6 +30,7 @@ * acconfig.h: Remove HAVE_WINSOCK_H, not used any longer. +>>>>>>> 1.4000.2.347 Sat Jan 3 11:39:42 2004 Manish Singh * gtk/gtkclipboard.c: Update freedesktop.org clipboard doc link. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e70a1ff96b..a5c04cf6c5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Jan 27 18:45:47 2004 Manish Singh + + * m4macros/gtk-2.0.m4: quote AC_DEFUN macro names so automake + 1.8 won't whine at us. + 2004-01-28 Tor Lillqvist * gdk/win32/gdkevents-win32.c (synthesize_leave_event, @@ -25,6 +30,7 @@ * acconfig.h: Remove HAVE_WINSOCK_H, not used any longer. +>>>>>>> 1.4000.2.347 Sat Jan 3 11:39:42 2004 Manish Singh * gtk/gtkclipboard.c: Update freedesktop.org clipboard doc link. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e70a1ff96b..a5c04cf6c5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Jan 27 18:45:47 2004 Manish Singh + + * m4macros/gtk-2.0.m4: quote AC_DEFUN macro names so automake + 1.8 won't whine at us. + 2004-01-28 Tor Lillqvist * gdk/win32/gdkevents-win32.c (synthesize_leave_event, @@ -25,6 +30,7 @@ * acconfig.h: Remove HAVE_WINSOCK_H, not used any longer. +>>>>>>> 1.4000.2.347 Sat Jan 3 11:39:42 2004 Manish Singh * gtk/gtkclipboard.c: Update freedesktop.org clipboard doc link. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e70a1ff96b..a5c04cf6c5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Jan 27 18:45:47 2004 Manish Singh + + * m4macros/gtk-2.0.m4: quote AC_DEFUN macro names so automake + 1.8 won't whine at us. + 2004-01-28 Tor Lillqvist * gdk/win32/gdkevents-win32.c (synthesize_leave_event, @@ -25,6 +30,7 @@ * acconfig.h: Remove HAVE_WINSOCK_H, not used any longer. +>>>>>>> 1.4000.2.347 Sat Jan 3 11:39:42 2004 Manish Singh * gtk/gtkclipboard.c: Update freedesktop.org clipboard doc link. diff --git a/m4macros/gtk-2.0.m4 b/m4macros/gtk-2.0.m4 index a0c53ac11f..36a1f9f760 100644 --- a/m4macros/gtk-2.0.m4 +++ b/m4macros/gtk-2.0.m4 @@ -5,7 +5,7 @@ dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, dnl pass to pkg-config dnl -AC_DEFUN(AM_PATH_GTK_2_0, +AC_DEFUN([AM_PATH_GTK_2_0], [dnl dnl Get the cflags and libraries from pkg-config dnl