sockets documentation and cleanup

[chaz/yoink] / configure.ac

diff --git a/configure.ac b/configure.ac
index a05e8236a4bc2301b40a19d1249420b10cc1e733..6820114ece89abb0a0564a145aa61693ac5e5a28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -77,11 +77,17 @@ AC_ARG_ENABLE([threads],
                          [threads=$enableval],
                          [threads=no])
 
-AC_ARG_WITH([gui-toolkit],
-                       [AS_HELP_STRING([--with-gui-toolkit=ARG],
-                                                       [possible values: none (default), gtk, qt4])],
-                       [gui_toolkit=$withval],
-                       [gui_toolkit=none])
+AC_ARG_WITH([gtk],
+                       [AS_HELP_STRING([--with-gtk],
+                                                       [use gtk2 modal dialogs])],
+                       [gtk=$withval],
+                       [gtk=no])
+
+AC_ARG_WITH([qt4],
+                       [AS_HELP_STRING([--with-qt4],
+                                                       [use qt4 modal dialogs; overridden by --with-gtk])],
+                       [qt4=$withval],
+                       [qt4=no])
 
 
 if test x$debug = xyes
@@ -121,11 +127,11 @@ then
                          [Define to 1 if you want to use threads when applicable.])
 fi
 
-if test x$gui_toolkit = xgtk
+if test x$gtk = xyes
 then
        AC_DEFINE([USE_GTK], 1,
                          [Define to 1 if you want to use GTK+ modal dialogs.])
-elif test x$gui_toolkit = xqt4
+elif test x$qt4 = xyes
 then
        AC_DEFINE([USE_QT4], 1,
                          [Define to 1 if you want to use QT4 modal dialogs.])
@@ -265,7 +271,7 @@ PKG_CHECK_MODULES([LUA], [lua],
                                   AC_MSG_WARN([Missing liblua ($website)])])
 
 ##### GTK+ 2.0 #####
-if test x$gui_toolkit = xgtk
+if test x$gtk = xyes
 then
        website="http://www.gtk.org/"
        PKG_CHECK_MODULES([GTK], [gtk+-2.0],
@@ -277,7 +283,7 @@ then
 fi
 
 ##### QT4 #####
-if test x$gui_toolkit = xqt4
+if test x$qt4 = xyes
 then
        website="http://qt.nokia.com/"
        PKG_CHECK_MODULES([QT4], [QtGui],
@@ -288,6 +294,12 @@ then
                                           AC_MSG_WARN([Missing QT4 ($website)])])
 fi
 
+if test x$WIN32 = xyes
+then
+       # On Windows, sockets are in the ws2_32 library.
+       LIBS="$LIBS -lws2_32"
+fi
+
 if test x$missing = xyes
 then
        AC_MSG_ERROR([You are missing some required libraries.])
@@ -300,7 +312,7 @@ AC_MSG_NOTICE([Checks for header files.])
 
 AC_HEADER_STDBOOL
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stddef.h stdint.h stdlib.h string.h unistd.h])
+AC_CHECK_HEADERS([arpa/inet.h byteswap.h fcntl.h stddef.h stdint.h stdlib.h string.h unistd.h])
 
 BOOST_SMART_PTR
 BOOST_STRING_ALGO
@@ -315,8 +327,8 @@ AC_MSG_NOTICE([Checks for types.])
 AC_TYPE_UINT8_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
 AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
 
 
 ####
@@ -333,7 +345,7 @@ AC_MSG_NOTICE([Checks for library functions.])
 
 AC_FUNC_ERROR_AT_LINE
 AC_FUNC_STRTOD
-AC_CHECK_FUNCS([nanosleep strchr strcspn strrchr strstr])
+AC_CHECK_FUNCS([fcntl ioctl nanosleep strchr strcspn strrchr strstr])
 
 if test x$clock_gettime = xyes
 then