[Freeciv-Dev] (PR#8651) Cygwin -mms-bitfields patch

["Marko Lindqvist" <marko.lindqvist@xxxxxxxxxxx>]

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


  This patch takes care of immediate problem of -mms-bitfields. With 
this patch, programs at least start.
  Handling other windows specialties seems to be more complicated than 
simply making all the same configure checks for cygwin as for mingw32. 
It might take more time than I can currently invest.


  - Caz


diff -Nurd freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac        2004-08-12 18:04:11.812500000 +0300
+++ freeciv/configure.ac        2004-08-12 20:26:12.328125000 +0300
@@ -299,10 +299,13 @@
 fi
 
 dnl Windows-specific settings
-AC_DIAGNOSE([obsolete],[AC_MINGW32 is obsolete: use AC_CANONICAL_HOST and 
$host_os])
 case $host_os in
-  *mingw32* ) MINGW32=yes;;
-          * ) MINGW32=no;;
+  *mingw32* ) MINGW32=yes ; 
+              CYGWIN=no   ;;
+  *cygwin*  ) MINGW32=no  ;
+              CYGWIN=yes  ;;
+          * ) MINGW32=no  ;
+              CYGWIN=no   ;;
 esac
 
 if test x"$MINGW32" = "xyes"; then
diff -Nurd freeciv/configure.in freeciv/configure.in
--- freeciv/configure.in        2004-08-12 18:04:11.828125000 +0300
+++ freeciv/configure.in        2004-08-12 20:26:15.359375000 +0300
@@ -298,6 +298,7 @@
 
 dnl Windows-specific settings
 AC_MINGW32
+AC_CYGWIN
 if test x"$MINGW32" = "xyes"; then
   AC_DEFINE(SOCKET_ZERO_ISNT_STDIN)
   AC_DEFINE(ALWAYS_ROOT)
diff -Nurd freeciv/m4/gtk2-client.m4 freeciv/m4/gtk2-client.m4
--- freeciv/m4/gtk2-client.m4   2004-08-12 18:04:43.656250000 +0300
+++ freeciv/m4/gtk2-client.m4   2004-08-12 20:27:24.546875000 +0300
@@ -11,7 +11,7 @@
         client="gtk-2.0"
         CLIENT_CFLAGS="$GTK_CFLAGS"
         CLIENT_LIBS="$GTK_LIBS"
-        if test x"$MINGW32" = "xyes"; then
+        if test x"$MINGW32" = "xyes" || test x"$CYGWIN" = "xyes" ; then
           dnl Required to compile gtk2 on Windows platform
           CFLAGS="$CFLAGS -mms-bitfields"
           CLIENT_LDFLAGS="$LDFLAGS -mwindows"