help tweak and tab cleanup

[irc/evilnet/x3.git] / configure.in

diff --git a/configure.in b/configure.in
index e25a4f779726a13ca37c2f977d3ca6db22027ffc..9b2374ccf4b44b88196172f8dd1d262cfb2c52b7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,8 @@ dnl Process this file with autoconf to create a configure script.
 
 dnl General initialization.
 AC_REVISION([$Id$])
-AC_PREREQ(2.57)
-AC_INIT(X3, 1.4, x2serv-general@lists.sourceforge.net)
+AC_PREREQ(2.59)
+AC_INIT([X3],[1.4],[x2serv-general@lists.sourceforge.net])
 CODENAME=X3
 AC_CONFIG_HEADERS(src/config.h)
 AC_CONFIG_SRCDIR(src/opserv.c)
@@ -67,7 +67,7 @@ AC_HEADER_TIME
 AC_STRUCT_TM
 
 dnl Would rather not bail on headers, BSD has alot of the functions elsewhere. -Jedi
-AC_CHECK_HEADERS(fcntl.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h regex.h arpa/inet.h sys/mman.h sys/stat.h dirent.h,,)
+AC_CHECK_HEADERS(fcntl.h tgmath.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h regex.h arpa/inet.h sys/mman.h sys/stat.h dirent.h,,)
 
 dnl Cygwin does not have d_type in struct dirent.  We use stat() as a fallback.
 AC_CHECK_MEMBER([struct dirent.d_type],
@@ -97,6 +97,32 @@ if test $ac_cv_sin_len = yes ; then
   AC_DEFINE(HAVE_SIN_LEN, 1, [Define if struct sockaddr_in contains a sin_len field])
 fi
 
+dnl Check for socklen_t.  In traditional BSD this is an int, but some
+dnl OSes use a different type.  Test until we find something that will
+dnl work properly.  Test borrowed from a patch submitted for Python.
+AC_CHECK_TYPE([socklen_t], ,[
+  AC_MSG_CHECKING([for socklen_t equivalent])
+  AC_CACHE_VAL([curl_cv_socklen_t_equiv],
+  [
+dnl Systems have either "struct sockaddr*" or "void*" as second
+dnl arg to getpeername.
+    curl_cv_socklen_t_equiv=
+    for arg2 in "struct sockaddr" void ; do
+      for t in int size_t unsigned long "unsigned long" ; do
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#include <sys/socket.h>
+int getpeername (int $arg2 *, $t *);]], [[$t len;
+  getpeername(0, 0, &len);]])],[curl_cv_socklen_t_equiv="$t"
+  break],[])
+      done
+    done
+  ])
+  AC_MSG_RESULT($curl_cv_socklen_t_equiv)
+  AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
+      [type to use in place of socklen_t if not defined])],
+  [#include <sys/types.h>
+#include<sys/socket.h>])
+
 dnl Can only check with -Werror, but the rest of configure doesn't like -Werror
 OLD_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -W -Wall -Werror"