Complete.Org: Mailing Lists: Archives: freeciv-dev: April 2004:
[Freeciv-Dev] Re: (PR#8534) Re: [FreeCiv-Cvs] jdorje: Two small cleanups
Home

[Freeciv-Dev] Re: (PR#8534) Re: [FreeCiv-Cvs] jdorje: Two small cleanups

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: undisclosed-recipients: ;
Subject: [Freeciv-Dev] Re: (PR#8534) Re: [FreeCiv-Cvs] jdorje: Two small cleanups to connectdlg_common: -...
From: "Raimar Falke" <i-freeciv-lists@xxxxxxxxxxxxx>
Date: Tue, 20 Apr 2004 10:26:54 -0700
Reply-to: rt@xxxxxxxxxxx

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

On Mon, Apr 19, 2004 at 11:18:29PM -0700, Jason Short wrote:
> 
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=8534 >
> 
> Raimar Falke wrote:
> 
> > $  ./autogen.sh 
> > + checking for autoconf >= 2.52 ... found 2.13, not ok !
> > + checking for autoconf >= 2.13 ... found 2.13, ok.
> > + checking for automake >= 1.4 ... found 1.4-p5, ok.
> > + checking for xgettext >= 0.10.36 ... found 0.11.1, ok.
> > + checking for msgfmt >= 0.10.36 ... found 0.11.1, ok.
> > + creating acinclude.m4
> > + running aclocal ...
> > aclocal: both `configure.ac' and `configure.in' present: ignoring 
> > `configure.in'
> > + running autoheader ... 
> > + running autoconf ... 
> > autoconf: Undefined macros:
> > configure.in:525:AC_FUNC_FORK
> > 
> > autoconf failed
> > 
> > Can someone please fix this?
> 
> Try this patch.  Please verify that HAVE_WORKING_FORK is defined 
> properly in config.h.

The attached patch works. Committed.

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
 "The BeOS takes the best features from the major operating systems. 
  It's got the power and flexibility of Unix, the interface and ease 
  of use of the MacOS, and Minesweeper from Windows."

Index: acconfig.old
===================================================================
RCS file: /home/freeciv/CVS/freeciv/acconfig.old,v
retrieving revision 1.4
diff -u -u -r1.4 acconfig.old
--- acconfig.old        13 Jan 2003 21:24:05 -0000      1.4
+++ acconfig.old        20 Apr 2004 17:23:11 -0000
@@ -66,6 +66,7 @@
 #undef SDL
 #undef WINMM
 #undef HAVE_GETTIMEOFDAY
+#undef HAVE_WORKING_FORK
 @BOTTOM@
 
 #endif /* FC_CONFIG_H */
Index: configure.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.in,v
retrieving revision 1.236
diff -u -u -r1.236 configure.in
--- configure.in        19 Apr 2004 17:24:16 -0000      1.236
+++ configure.in        20 Apr 2004 17:23:12 -0000
@@ -523,7 +523,6 @@
 
 dnl Checks for library functions.
 AC_TYPE_SIGNAL
-AC_FUNC_FORK
 AC_FUNC_STRCOLL
 AC_FUNC_VPRINTF
 AC_FUNC_VSNPRINTF
@@ -531,6 +530,7 @@
 AC_CHECK_FUNCS([fileno ftime gethostname getpwuid inet_aton \
                select snooze strerror strcasecmp strncasecmp \
                strlcat strlcpy strstr usleep vsnprintf uname flock])
+AC_CHECK_FUNC([fork], AC_DEFINE(HAVE_WORKING_FORK))
 AC_MSG_CHECKING(for working gettimeofday)
   FC_CHECK_GETTIMEOFDAY_RUNTIME(,AC_DEFINE(HAVE_GETTIMEOFDAY),)
 

[Prev in Thread] Current Thread [Next in Thread]