<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39652 >
On 03/09/07, Marko Lindqvist wrote: > > How about committing this one now and opening another ticket about > cross-compilation problem? > Having it to compile at least natively is better than not at all... > > Or does someone come up with patch soon? (I myself have higher > priority things to do than to build another cross-compilation > environment just now, sorry) Well, I have no environment to *test*, but I wrote patch anyway. This updates also mingw32 handling to present autoconf standards (AC_CANONICAL_HOST has been recommended since autoconf-2.13) Could you test if this works (for native builds at least)? - ML
diff -Nurd -X.diff_ignore freeciv/configure.ac freeciv/configure.ac --- freeciv/configure.ac 2007-08-26 22:11:42.000000000 +0300 +++ freeciv/configure.ac 2007-09-03 13:39:15.000000000 +0300 @@ -341,22 +341,32 @@ AC_DEFINE(ALWAYS_ROOT, 1, [Amiga-specific setting - root]) fi -dnl Windows-specific settings -AC_DIAGNOSE([obsolete],[AC_MINGW32 is obsolete: use AC_CANONICAL_HOST and $host_os]) +AC_CANONICAL_HOST -if test x"$MINGW32" = "xyes"; then - AC_CHECK_TOOL([WINDRES], [windres]) - if test -z $WINDRES; then - AC_MSG_ERROR([*** 'windres' missing. Install binutils, fix your \$PATH, or set \$WINDRES manually. ***]) - fi +dnl Settings specific to host OS +case "$host_os" in - AC_DEFINE(SOCKET_ZERO_ISNT_STDIN, 1, [Mingw32-specific setting - stdin]) - AC_DEFINE(ALWAYS_ROOT, 1, [Mingw32-specific setting - root]) - AC_DEFINE(WIN32_NATIVE, 1, [Mingw32-specific setting - native]) - AC_DEFINE(HAVE_WINSOCK, 1, [Mingw32-specific setting - winsock]) - AC_DEFINE(NONBLOCKING_SOCKETS, 1, [nonblocking sockets support]) - LIBS="$LIBS -lwsock32" -fi + *mingw*) + dnl Windows-specific settings + AC_CHECK_TOOL([WINDRES], [windres]) + if test -z $WINDRES; then + AC_MSG_ERROR([*** 'windres' missing. Install binutils, fix your \$PATH, or set \$WINDRES manually. ***]) + fi + + AC_DEFINE([SOCKET_ZERO_ISNT_STDIN], [1], [Mingw32-specific setting - stdin]) + AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - Mingw32]) + AC_DEFINE([WIN32_NATIVE], [1], [Mingw32-specific setting - native]) + AC_DEFINE([HAVE_WINSOCK], [1], [Mingw32-specific setting - winsock]) + AC_DEFINE([NONBLOCKING_SOCKETS], [1], [nonblocking sockets support]) + LIBS="$LIBS -lwsock32" + ;; + + *skyos*) + dnl SkyOS specific settings + AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - SkyOS]) + ;; + +esac dnl note this has to match the path installed by po/Makefile if test x"$MINGW32" != "xyes"; then
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
