Author: cazfi
Date: Thu Jan 28 06:41:58 2016
New Revision: 31649
URL: http://svn.gna.org/viewcvs/freeciv?rev=31649&view=rev
Log:
Added winsock2.h configure check that works when winsock2.h must be included
before any
standard headers.
See patch #6837
Added:
branches/S2_6/m4/winsock2.m4
Modified:
branches/S2_6/Makefile.am
branches/S2_6/configure.ac
Modified: branches/S2_6/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/Makefile.am?rev=31649&r1=31648&r2=31649&view=diff
==============================================================================
--- branches/S2_6/Makefile.am (original)
+++ branches/S2_6/Makefile.am Thu Jan 28 06:41:58 2016
@@ -75,6 +75,7 @@
m4/sound.m4 \
m4/vsnprintf.m4 \
m4/web-client.m4 \
+ m4/winsock2.m4 \
m4/xaw-client.m4 \
m4/x.m4 \
m4/testmatic.m4 \
Modified: branches/S2_6/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=31649&r1=31648&r2=31649&view=diff
==============================================================================
--- branches/S2_6/configure.ac (original)
+++ branches/S2_6/configure.ac Thu Jan 28 06:41:58 2016
@@ -177,8 +177,8 @@
*mingw32*)
dnl Windows-specific settings
MINGW32=yes
+ FC_WINSOCK2_INCLUDE([AC_DEFINE([FREECIV_HAVE_WINSOCK2], [1],
[Mingw32-specific setting - winsock2])])
AC_DEFINE([FREECIV_HAVE_WINSOCK], [1], [Mingw32-specific setting -
winsock])
- AC_CHECK_HEADERS([winsock2.h], [AC_DEFINE([FREECIV_HAVE_WINSOCK2], [1],
[Mingw32-specific setting - winsock2])])
AC_CHECK_HEADERS([ws2tcpip.h], [AC_DEFINE([FREECIV_HAVE_WS2TCPIP_H], [1],
[ws2tcpip.h available])])
AC_CHECK_HEADERS([direct.h])
Added: branches/S2_6/m4/winsock2.m4
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/winsock2.m4?rev=31649&view=auto
==============================================================================
--- branches/S2_6/m4/winsock2.m4 (added)
+++ branches/S2_6/m4/winsock2.m4 Thu Jan 28 06:41:58 2016
@@ -0,0 +1,19 @@
+# Macros to help with winsock2 setup
+#
+# serial 1
+
+# Prepend winsock2.h to default includes if possible.
+# Set HAVE_WINSOCK2 if winsock2.h was found.
+#
+# FC_WINSOCK2_INCLUDE([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+#
+AC_DEFUN([FC_WINSOCK2_INCLUDE],
+[
+ dnl We have to poke autoconf internals so we get correct include order for
the tests
+ _backup_includes_default="${ac_include_headers}"
+ ac_includes_default="\
+#include <winsock2.h>
+${ac_includes_default}"
+ AC_CHECK_HEADER([winsock2.h], [$1],
[ac_includes_default="$_backup_includes_default"
+$2])
+])
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
