[Freeciv-Dev] (PR#10158) PR#10157

["(Gilles J. Seguin)" <segg@xxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10158 >

the patch, but this time, it is unzipped.


Index: freeciv/m4/debug.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/debug.m4,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 debug.m4
--- freeciv/m4/debug.m4 1 Dec 2002 16:14:23 -0000       1.2.2.1
+++ freeciv/m4/debug.m4 17 Sep 2004 02:30:50 -0000
@@ -1,4 +1,4 @@
-AC_DEFUN(FC_DEBUG, [
+AC_DEFUN([FC_DEBUG], [
 AC_ARG_ENABLE(debug,
 [  --enable-debug[[=no/some/yes]]  turn on debugging [[default=some]]],
 [case "${enableval}" in   
Index: freeciv/m4/esd.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/esd.m4,v
retrieving revision 1.1
diff -u -r1.1 esd.m4
--- freeciv/m4/esd.m4   22 Apr 2002 20:06:20 -0000      1.1
+++ freeciv/m4/esd.m4   17 Sep 2004 02:30:50 -0000
@@ -7,7 +7,7 @@
 dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
 dnl
-AC_DEFUN(AM_PATH_ESD,
+AC_DEFUN([AM_PATH_ESD],
 [dnl 
 dnl Get the cflags and libraries from the esd-config script
 dnl
@@ -172,7 +172,7 @@
 dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, 
ACTION-IF-NOT-SUPPORTS]])
 dnl Test, whether esd supports multiple recording clients (version >=0.2.21)
 dnl
-AC_DEFUN(AM_ESD_SUPPORTS_MULTIPLE_RECORD,
+AC_DEFUN([AM_ESD_SUPPORTS_MULTIPLE_RECORD],
 [dnl
   AC_MSG_NOTICE([whether installed esd version supports multiple recording 
clients])
   ac_save_ESD_CFLAGS="$ESD_CFLAGS"
Index: freeciv/m4/glib-2.0.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/glib-2.0.m4,v
retrieving revision 1.2
diff -u -r1.2 glib-2.0.m4
--- freeciv/m4/glib-2.0.m4      29 May 2002 21:06:27 -0000      1.2
+++ freeciv/m4/glib-2.0.m4      17 Sep 2004 02:30:53 -0000
@@ -5,7 +5,7 @@
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject 
or 
 dnl gthread is specified in MODULES, pass to pkg-config
 dnl
-AC_DEFUN(AM_PATH_GLIB_2_0,
+AC_DEFUN([AM_PATH_GLIB_2_0],
 [dnl 
 dnl Get the cflags and libraries from pkg-config
 dnl
Index: freeciv/m4/glib-gettext.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/glib-gettext.m4,v
retrieving revision 1.1
diff -u -r1.1 glib-gettext.m4
--- freeciv/m4/glib-gettext.m4  13 Apr 2002 13:51:46 -0000      1.1
+++ freeciv/m4/glib-gettext.m4  17 Sep 2004 02:30:54 -0000
@@ -19,7 +19,7 @@
 
 # serial 5
 
-AC_DEFUN(AM_GLIB_WITH_NLS,
+AC_DEFUN([AM_GLIB_WITH_NLS],
   dnl NLS is obligatory
   [USE_NLS=yes
     AC_SUBST(USE_NLS)
@@ -142,7 +142,7 @@
     AC_SUBST(POSUB)
   ])
 
-AC_DEFUN(AM_GLIB_GNU_GETTEXT,
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
Index: freeciv/m4/glib.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/glib.m4,v
retrieving revision 1.1
diff -u -r1.1 glib.m4
--- freeciv/m4/glib.m4  13 Apr 2002 13:51:46 -0000      1.1
+++ freeciv/m4/glib.m4  17 Sep 2004 02:30:55 -0000
@@ -5,7 +5,7 @@
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
 dnl gthread is specified in MODULES, pass to glib-config
 dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
 [dnl 
 dnl Get the cflags and libraries from the glib-config script
 dnl
Index: freeciv/m4/gtk-2.0.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/gtk-2.0.m4,v
retrieving revision 1.2
diff -u -r1.2 gtk-2.0.m4
--- freeciv/m4/gtk-2.0.m4       29 May 2002 21:06:27 -0000      1.2
+++ freeciv/m4/gtk-2.0.m4       17 Sep 2004 02:30:55 -0000
@@ -5,7 +5,7 @@
 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
Index: freeciv/m4/gtk.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/gtk.m4,v
retrieving revision 1.2
diff -u -r1.2 gtk.m4
--- freeciv/m4/gtk.m4   28 May 2002 22:33:37 -0000      1.2
+++ freeciv/m4/gtk.m4   17 Sep 2004 02:30:55 -0000
@@ -4,7 +4,7 @@
 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, 
MODULES]]]])
 dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
 dnl
-AC_DEFUN(AM_PATH_GTK,
+AC_DEFUN([AM_PATH_GTK],
 [dnl 
 dnl Get the cflags and libraries from the gtk-config script
 dnl
Index: freeciv/m4/imlib.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/imlib.m4,v
retrieving revision 1.1
diff -u -r1.1 imlib.m4
--- freeciv/m4/imlib.m4 13 Apr 2002 13:51:47 -0000      1.1
+++ freeciv/m4/imlib.m4 17 Sep 2004 02:30:58 -0000
@@ -6,7 +6,7 @@
 dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS
 dnl
-AC_DEFUN(AM_PATH_IMLIB,
+AC_DEFUN([AM_PATH_IMLIB],
 [dnl 
 dnl Get the cflags and libraries from the imlib-config script
 dnl
@@ -164,7 +164,7 @@
 ])
 
 # Check for gdk-imlib
-AC_DEFUN(AM_PATH_GDK_IMLIB,
+AC_DEFUN([AM_PATH_GDK_IMLIB],
 [dnl 
 dnl Get the cflags and libraries from the imlib-config script
 dnl
Index: freeciv/m4/ngettext.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/ngettext.m4,v
retrieving revision 1.1
diff -u -r1.1 ngettext.m4
--- freeciv/m4/ngettext.m4      13 Apr 2002 13:51:47 -0000      1.1
+++ freeciv/m4/ngettext.m4      17 Sep 2004 02:30:58 -0000
@@ -5,7 +5,7 @@
 dnl version which comes with glibc 2.2.5 is broken, gettext 
 dnl version 0.10.38 however is ok).
 
-AC_DEFUN(FC_CHECK_NGETTEXT_RUNTIME,
+AC_DEFUN([FC_CHECK_NGETTEXT_RUNTIME],
 [
 templibs="$LIBS"
 LIBS="$1 $LIBS"
Index: freeciv/m4/readline.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/readline.m4,v
retrieving revision 1.2
diff -u -r1.2 readline.m4
--- freeciv/m4/readline.m4      22 May 2002 22:01:04 -0000      1.2
+++ freeciv/m4/readline.m4      17 Sep 2004 02:30:58 -0000
@@ -7,7 +7,7 @@
 dnl to included -lreadline and parameter EXTRA-LIBS.
 dnl Should already have checked that header and library exist.
 dnl
-AC_DEFUN(FC_CHECK_READLINE_RUNTIME,
+AC_DEFUN([FC_CHECK_READLINE_RUNTIME],
 [AC_MSG_CHECKING(whether readline works at runtime)
 templibs="$LIBS"
 LIBS="-lreadline $1 $LIBS"
Index: freeciv/m4/sdl.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/sdl.m4,v
retrieving revision 1.1
diff -u -r1.1 sdl.m4
--- freeciv/m4/sdl.m4   22 Apr 2002 20:06:21 -0000      1.1
+++ freeciv/m4/sdl.m4   17 Sep 2004 02:30:58 -0000
@@ -8,7 +8,7 @@
 dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
 dnl
-AC_DEFUN(AM_PATH_SDL,
+AC_DEFUN([AM_PATH_SDL],
 [dnl 
 dnl Get the cflags and libraries from the sdl-config script
 dnl
Index: freeciv/m4/sound.m4
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/sound.m4,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 sound.m4
--- freeciv/m4/sound.m4 18 Nov 2002 11:14:18 -0000      1.1.2.1
+++ freeciv/m4/sound.m4 17 Sep 2004 02:30:58 -0000
@@ -1,4 +1,4 @@
-AC_DEFUN(FC_CHECK_SOUND,[
+AC_DEFUN([FC_CHECK_SOUND],[
  AC_ARG_ENABLE(esd,
    [  --disable-esd           Do not try to use Esound],
    USE_SOUND=no, USE_SOUND_ESD=yes)
Index: freeciv/m4/x.252
===================================================================
RCS file: /home/freeciv/CVS/freeciv/m4/x.252,v
retrieving revision 1.1
diff -u -r1.1 x.252
--- freeciv/m4/x.252    5 May 2002 12:34:54 -0000       1.1
+++ freeciv/m4/x.252    17 Sep 2004 02:31:00 -0000
@@ -21,7 +21,7 @@
 dnl     [etc.]
 dnl   LIBS="$X_LIBS $X_EXTRA_LIBS $LIBS"
 dnl
-AC_DEFUN(FC_CHECK_X_LIB, [
+AC_DEFUN([FC_CHECK_X_LIB], [
  AC_MSG_CHECKING([for $2 in X library -l$1])
 
  dnl Use a cache variable name containing both the library and function name,
@@ -71,7 +71,7 @@
 dnl eg, then: AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
 dnl by Alexandre Oliva 
 dnl from http://www.cygnus.com/ml/automake/1998-Aug/0040.html
-AC_DEFUN(FC_EXPAND_DIR, [
+AC_DEFUN([FC_EXPAND_DIR], [
         $1=$2
         $1=`(
             test "x$prefix" = xNONE && prefix="$ac_default_prefix"
@@ -92,7 +92,7 @@
 dnl likely, else set to "no".
 dnl Doesn't do any cache stuff.
 dnl
-AC_DEFUN(FC_XPM_PATHS,
+AC_DEFUN([FC_XPM_PATHS],
 [AC_MSG_CHECKING(extra paths for Xpm)
 dnl General Xpm prefix:
 dnl "no" means no prefix is required, "yes" means try /usr/local
@@ -167,7 +167,7 @@
 dnl     AC_DEFINE_UNQUOTED(FUNCPROTO, $fc_x_proto_value)
 dnl   fi
 dnl
-AC_DEFUN(FC_CHECK_X_PROTO_DEFINE,
+AC_DEFUN([FC_CHECK_X_PROTO_DEFINE],
 [AC_REQUIRE([FC_CHECK_X_PROTO_FETCH])dnl
 AC_MSG_CHECKING(for Xfuncproto control definition $1)
 # Search for the requested defined variable; return it's value:
@@ -201,7 +201,7 @@
 dnl Example use:
 dnl   AC_REQUIRE([FC_CHECK_X_PROTO_FETCH])
 dnl
-AC_DEFUN(FC_CHECK_X_PROTO_FETCH,
+AC_DEFUN([FC_CHECK_X_PROTO_FETCH],
 [AC_REQUIRE([AC_PATH_X])dnl
 AC_MSG_CHECKING(whether Xfuncproto was supplied)
 dnl May override determined defines with explicit argument:
@@ -295,7 +295,7 @@
 dnl     echo Compile using FUNCPROTO=$fc_x_proto_FUNCPROTO
 dnl   fi
 dnl
-AC_DEFUN(FC_CHECK_X_PROTO_FUNCPROTO_COMPILE,
+AC_DEFUN([FC_CHECK_X_PROTO_FUNCPROTO_COMPILE],
 [AC_REQUIRE([AC_PATH_XTRA])dnl
 AC_LANG_SAVE
 AC_LANG_C
@@ -340,7 +340,7 @@
 dnl     echo Compile using NARROWPROTO=$fc_x_proto_NARROWPROTO
 dnl   fi
 dnl
-AC_DEFUN(FC_CHECK_X_PROTO_NARROWPROTO_WORKS,
+AC_DEFUN([FC_CHECK_X_PROTO_NARROWPROTO_WORKS],
 [AC_REQUIRE([AC_PATH_XTRA])dnl
 AC_LANG_SAVE
 AC_LANG_C