From: Michael Poole <mdpoole@troilus.org>
Date: Sun, 19 Sep 2004 14:25:26 +0000 (+0000)
Subject: Fix bugs exposed by hikari's update to configure.in.
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=0f4cd319f2b9cc9eb39380f2d2f3aa0d970a20d7

Fix bugs exposed by hikari's update to configure.in.


git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1154 c9e4aea6-c8fd-4c43-8297-357d70d61c8c
---

diff --git a/ChangeLog b/ChangeLog
index 0252359..69a966b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-19  Michael Poole <mdpoole@troilus.org>
+
+	* acinclude.m4: Clean up AC_DEFINE()s so we no longer need
+	acconfig.h.
+
+	* acconfig.h: Remove since it is now redundant.
+
+	* aclocal.m4, config.h.in, configure: Regenerate.
+
 2004-09-19  hikari <hikari@undernet.org>
 
 	* configure.in: Fixed configure script rules to fail if (f)lex or yacc/bison 
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 3ad4e1f..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef INCLUDED_config_h
-#define INCLUDED_config_h
-/*
- * IRC - Internet Relay Chat, acconfig.h
- * Copyright (C) 2000 Kevin L. Mitchell <klmitch@mit.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id$
- */
-@TOP@
-
-/* Define if you have the setrlimit function */
-#undef HAVE_SETRLIMIT
-
-/* Define one of these, depending on wether you have
- * POSIX, BSD or SYSV non-blocking stuff
- */
-#undef NBLOCK_POSIX
-#undef NBLOCK_BSD
-#undef NBLOCK_SYSV
-
-/* Define on of these, depending on wether you have
- * POSIX, BSD or SYSV signal handling
- */
-#undef POSIX_SIGNALS
-#undef BSD_RELIABLE_SIGNALS
-#undef SYSV_UNRELIABLE_SIGNALS
-
-/* Define these to be unsigned integral internal types,
- * of respecitvely 2 and 4 bytes in size, when not already
- * defined in <sys/types.h>, <stdlib.h> or <stddef.h>
- */
-#undef u_int16_t
-#undef u_int32_t
-
-/* Define to force the poll() function to be used */
-#undef USE_POLL
-/* Define to enable the /dev/poll engine */
-#undef USE_DEVPOLL
-/* Define to enable the kqueue engine */
-#undef USE_KQUEUE
-
-/* Define to enable various debugging code in the server; DO NOT USE
- * THIS ON PRODUCTION SERVERS ON PAIN OF DELINKING!
- */
-#undef DEBUGMODE
-
-/* Define this to DISable various assertion checking statements */
-#undef NDEBUG
-
-/* Define to force certain critical functions to be inlined */
-#undef FORCEINLINE
-
-/* Define to be the local domain name for some statics gathering */
-#undef DOMAINNAME
-
-/* Define to be the name of the executable to be executed on /restart */
-#undef SPATH
-
-/* Define to be the path to the data directory */
-#undef DPATH
-
-/* Define to be the name of the configuration file */
-#undef CPATH
-
-/* Define to be the name of the debugging log file */
-#undef LPATH
-
-/* Define to be the maximum number of network connections */
-#undef MAXCONNECTIONS
-
-@BOTTOM@
-#endif /* INCLUDED_config_h */
diff --git a/acinclude.m4 b/acinclude.m4
index 6e3e4d8..9ad93d1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -55,7 +55,7 @@ int main(void)
   exit(1);
 }], unet_cv_sys_nonblocking_posix=yes, unet_cv_sys_nonblocking_posix=no)])
 if test $unet_cv_sys_nonblocking_posix = yes; then
-  AC_DEFINE(NBLOCK_POSIX)
+  AC_DEFINE([NBLOCK_POSIX],,[Define if you have POSIX non-blocking sockets.])
 else
 AC_CACHE_CHECK([for bsd non-blocking], unet_cv_sys_nonblocking_bsd,
 [AC_TRY_RUN([#include <sys/types.h>
@@ -82,9 +82,9 @@ int main(void)
   exit(1);
 }], unet_cv_sys_nonblocking_bsd=yes, unet_cv_sys_nonblocking_bsd=no)])
 if test $unet_cv_sys_nonblocking_bsd = yes; then
-  AC_DEFINE(NBLOCK_BSD)
+  AC_DEFINE([NBLOCK_BSD],,[Define if you have BSD non-blocking sockets.])
 else
-  AC_DEFINE(NBLOCK_SYSV)
+  AC_DEFINE([NBLOCK_SYSV],,[Define if you have SysV non-blocking sockets.])
 fi
 fi])
 
@@ -102,7 +102,7 @@ AC_CACHE_CHECK([for posix signals], unet_cv_sys_signal_posix,
 [sigaction(SIGTERM, (struct sigaction *)0L, (struct sigaction *)0L)],
 unet_cv_sys_signal_posix=yes, unet_cv_sys_signal_posix=no)])
 if test $unet_cv_sys_signal_posix = yes; then
-  AC_DEFINE(POSIX_SIGNALS)
+  AC_DEFINE([POSIX_SIGNALS],,[Define if you have POSIX signals.])
 else
 AC_CACHE_CHECK([for bsd reliable signals], unet_cv_sys_signal_bsd,
 [AC_TRY_RUN([#include <signal.h>
@@ -121,9 +121,9 @@ int main(void)
   exit (0);
 }], unet_cv_sys_signal_bsd=yes, unet_cv_sys_signal_bsd=no)])
 if test $unet_cv_sys_signal_bsd = yes; then
-  AC_DEFINE(BSD_RELIABLE_SIGNALS)
+  AC_DEFINE([BSD_RELIABLE_SIGNALS],,[Define if you have (reliable) BSD signals.])
 else
-  AC_DEFINE(SYSV_UNRELIABLE_SIGNALS)
+  AC_DEFINE([SYSV_UNRELIABLE_SIGNALS],,[Define if you have (unreliable) SysV signals.])
 fi
 fi])
 
@@ -140,22 +140,22 @@ AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(void *)
 if test "$ac_cv_sizeof_int" = 2 ; then
   AC_CHECK_TYPE(int16_t, int)
-  AC_CHECK_TYPE(u_int16_t, unsigned int)
+  AC_CHECK_TYPE(uint16_t, unsigned int)
 elif test "$ac_cv_sizeof_short" = 2 ; then
   AC_CHECK_TYPE(int16_t, short)
-  AC_CHECK_TYPE(u_int16_t, unsigned short)
+  AC_CHECK_TYPE(uint16_t, unsigned short)
 else
   AC_MSG_ERROR([Cannot find a type with size of 16 bits])
 fi
 if test "$ac_cv_sizeof_int" = 4 ; then
   AC_CHECK_TYPE(int32_t, int)
-  AC_CHECK_TYPE(u_int32_t, unsigned int)
+  AC_CHECK_TYPE(uint32_t, unsigned int)
 elif test "$ac_cv_sizeof_short" = 4 ; then
   AC_CHECK_TYPE(int32_t, short)
-  AC_CHECK_TYPE(u_int32_t, unsigned short)
+  AC_CHECK_TYPE(uint32_t, unsigned short)
 elif test "$ac_cv_sizeof_long" = 4 ; then
   AC_CHECK_TYPE(int32_t, long)
-  AC_CHECK_TYPE(u_int32_t, unsigned long)
+  AC_CHECK_TYPE(uint32_t, unsigned long)
 else
   AC_MSG_ERROR([Cannot find a type with size of 32 bits])
 fi])
diff --git a/aclocal.m4 b/aclocal.m4
index 9375541..32fd6be 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,14 +1,15 @@
-dnl aclocal.m4t generated automatically by aclocal 1.4-p6
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 dnl
 dnl Macro: unet_PIPE_CFLAGS
@@ -67,7 +68,7 @@ int main(void)
   exit(1);
 }], unet_cv_sys_nonblocking_posix=yes, unet_cv_sys_nonblocking_posix=no)])
 if test $unet_cv_sys_nonblocking_posix = yes; then
-  AC_DEFINE(NBLOCK_POSIX)
+  AC_DEFINE([NBLOCK_POSIX],,[Define if you have POSIX non-blocking sockets.])
 else
 AC_CACHE_CHECK([for bsd non-blocking], unet_cv_sys_nonblocking_bsd,
 [AC_TRY_RUN([#include <sys/types.h>
@@ -94,9 +95,9 @@ int main(void)
   exit(1);
 }], unet_cv_sys_nonblocking_bsd=yes, unet_cv_sys_nonblocking_bsd=no)])
 if test $unet_cv_sys_nonblocking_bsd = yes; then
-  AC_DEFINE(NBLOCK_BSD)
+  AC_DEFINE([NBLOCK_BSD],,[Define if you have BSD non-blocking sockets.])
 else
-  AC_DEFINE(NBLOCK_SYSV)
+  AC_DEFINE([NBLOCK_SYSV],,[Define if you have SysV non-blocking sockets.])
 fi
 fi])
 
@@ -114,7 +115,7 @@ AC_CACHE_CHECK([for posix signals], unet_cv_sys_signal_posix,
 [sigaction(SIGTERM, (struct sigaction *)0L, (struct sigaction *)0L)],
 unet_cv_sys_signal_posix=yes, unet_cv_sys_signal_posix=no)])
 if test $unet_cv_sys_signal_posix = yes; then
-  AC_DEFINE(POSIX_SIGNALS)
+  AC_DEFINE([POSIX_SIGNALS],,[Define if you have POSIX signals.])
 else
 AC_CACHE_CHECK([for bsd reliable signals], unet_cv_sys_signal_bsd,
 [AC_TRY_RUN([#include <signal.h>
@@ -133,9 +134,9 @@ int main(void)
   exit (0);
 }], unet_cv_sys_signal_bsd=yes, unet_cv_sys_signal_bsd=no)])
 if test $unet_cv_sys_signal_bsd = yes; then
-  AC_DEFINE(BSD_RELIABLE_SIGNALS)
+  AC_DEFINE([BSD_RELIABLE_SIGNALS],,[Define if you have (reliable) BSD signals.])
 else
-  AC_DEFINE(SYSV_UNRELIABLE_SIGNALS)
+  AC_DEFINE([SYSV_UNRELIABLE_SIGNALS],,[Define if you have (unreliable) SysV signals.])
 fi
 fi])
 
@@ -152,22 +153,22 @@ AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(void *)
 if test "$ac_cv_sizeof_int" = 2 ; then
   AC_CHECK_TYPE(int16_t, int)
-  AC_CHECK_TYPE(u_int16_t, unsigned int)
+  AC_CHECK_TYPE(uint16_t, unsigned int)
 elif test "$ac_cv_sizeof_short" = 2 ; then
   AC_CHECK_TYPE(int16_t, short)
-  AC_CHECK_TYPE(u_int16_t, unsigned short)
+  AC_CHECK_TYPE(uint16_t, unsigned short)
 else
   AC_MSG_ERROR([Cannot find a type with size of 16 bits])
 fi
 if test "$ac_cv_sizeof_int" = 4 ; then
   AC_CHECK_TYPE(int32_t, int)
-  AC_CHECK_TYPE(u_int32_t, unsigned int)
+  AC_CHECK_TYPE(uint32_t, unsigned int)
 elif test "$ac_cv_sizeof_short" = 4 ; then
   AC_CHECK_TYPE(int32_t, short)
-  AC_CHECK_TYPE(u_int32_t, unsigned short)
+  AC_CHECK_TYPE(uint32_t, unsigned short)
 elif test "$ac_cv_sizeof_long" = 4 ; then
   AC_CHECK_TYPE(int32_t, long)
-  AC_CHECK_TYPE(u_int32_t, unsigned long)
+  AC_CHECK_TYPE(uint32_t, unsigned long)
 else
   AC_MSG_ERROR([Cannot find a type with size of 32 bits])
 fi])
@@ -227,7 +228,24 @@ AC_DEFUN(AC_LIBRARY_NET, [
   ])
 
 
-# serial 1
+# Copyright 1996, 1997, 1999, 2000, 2001, 2002  Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
 
 # @defmac AC_PROG_CC_STDC
 # @maindex PROG_CC_STDC
@@ -254,7 +272,7 @@ dnl like #elif.
 dnl FIXME: can't do this because then AC_AIX won't work due to a
 dnl circular dependency.
 dnl AC_BEFORE([$0], [AC_PROG_CPP])
-AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
+AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
 AC_CACHE_VAL(am_cv_prog_cc_stdc,
 [am_cv_prog_cc_stdc=no
 ac_save_CC="$CC"
@@ -262,9 +280,10 @@ ac_save_CC="$CC"
 # breaks some systems' header files.
 # AIX			-qlanglvl=ansi
 # Ultrix and OSF/1	-std1
-# HP-UX			-Aa -D_HPUX_SOURCE
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
 # SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   AC_TRY_COMPILE(
@@ -306,7 +325,7 @@ CC="$ac_save_CC"
 if test -z "$am_cv_prog_cc_stdc"; then
   AC_MSG_RESULT([none needed])
 else
-  AC_MSG_RESULT($am_cv_prog_cc_stdc)
+  AC_MSG_RESULT([$am_cv_prog_cc_stdc])
 fi
 case "x$am_cv_prog_cc_stdc" in
   x|xno) ;;
@@ -314,3 +333,5 @@ case "x$am_cv_prog_cc_stdc" in
 esac
 ])
 
+AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC])
+
diff --git a/config.h.in b/config.h.in
index 03167a8..aca336e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,87 +1,7 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
-#ifndef INCLUDED_config_h
-#define INCLUDED_config_h
-/*
- * IRC - Internet Relay Chat, acconfig.h
- * Copyright (C) 2000 Kevin L. Mitchell <klmitch@mit.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id: config.h.in,v 1.10 2004-09-19 12:19:30 shad0w Exp $
- */
-
-/* Define if you have the setrlimit function */
-#undef HAVE_SETRLIMIT
 
-/* Define one of these, depending on wether you have
- * POSIX, BSD or SYSV non-blocking stuff
- */
-#undef NBLOCK_POSIX
-#undef NBLOCK_BSD
-#undef NBLOCK_SYSV
-
-/* Define on of these, depending on wether you have
- * POSIX, BSD or SYSV signal handling
- */
-#undef POSIX_SIGNALS
+/* Define if you have (reliable) BSD signals. */
 #undef BSD_RELIABLE_SIGNALS
-#undef SYSV_UNRELIABLE_SIGNALS
-
-/* Define these to be unsigned integral internal types,
- * of respecitvely 2 and 4 bytes in size, when not already
- * defined in <sys/types.h>, <stdlib.h> or <stddef.h>
- */
-#undef u_int16_t
-#undef u_int32_t
-
-/* Define to force the poll() function to be used */
-#undef USE_POLL
-/* Define to enable the /dev/poll engine */
-#undef USE_DEVPOLL
-/* Define to enable the kqueue engine */
-#undef USE_KQUEUE
-
-/* Define to enable various debugging code in the server; DO NOT USE
- * THIS ON PRODUCTION SERVERS ON PAIN OF DELINKING!
- */
-#undef DEBUGMODE
-
-/* Define this to DISable various assertion checking statements */
-#undef NDEBUG
-
-/* Define to force certain critical functions to be inlined */
-#undef FORCEINLINE
-
-/* Define to be the local domain name for some statics gathering */
-#undef DOMAINNAME
-
-/* Define to be the name of the executable to be executed on /restart */
-#undef SPATH
-
-/* Define to be the path to the data directory */
-#undef DPATH
-
-/* Define to be the name of the configuration file */
-#undef CPATH
-
-/* Define to be the name of the debugging log file */
-#undef LPATH
-
-/* Define to be the maximum number of network connections */
-#undef MAXCONNECTIONS
-
 
 /* Configuration file name */
 #undef CPATH
@@ -192,6 +112,15 @@
 /* Maximum number of network connections */
 #undef MAXCONNECTIONS
 
+/* Define if you have BSD non-blocking sockets. */
+#undef NBLOCK_BSD
+
+/* Define if you have POSIX non-blocking sockets. */
+#undef NBLOCK_POSIX
+
+/* Define if you have SysV non-blocking sockets. */
+#undef NBLOCK_SYSV
+
 /* Disable assertions */
 #undef NDEBUG
 
@@ -210,6 +139,9 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define if you have POSIX signals. */
+#undef POSIX_SIGNALS
+
 /* The size of a `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
@@ -228,6 +160,9 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Define if you have (unreliable) SysV signals. */
+#undef SYSV_UNRELIABLE_SIGNALS
+
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
@@ -269,12 +204,11 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef socklen_t
 
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef uid_t
+
 /* Define to `unsigned short' if <sys/types.h> does not define. */
-#undef u_int16_t
+#undef uint16_t
 
 /* Define to `unsigned long' if <sys/types.h> does not define. */
-#undef u_int32_t
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef uid_t
-#endif /* INCLUDED_config_h */
+#undef uint32_t
diff --git a/configure b/configure
index 974e0ce..bcc3b47 100755
--- a/configure
+++ b/configure
@@ -2366,9 +2366,10 @@ ac_save_CC="$CC"
 # breaks some systems' header files.
 # AIX			-qlanglvl=ansi
 # Ultrix and OSF/1	-std1
-# HP-UX			-Aa -D_HPUX_SOURCE
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
 # SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   cat >conftest.$ac_ext <<_ACEOF
@@ -6050,9 +6051,9 @@ _ACEOF
 
 fi
 
-  echo "$as_me:$LINENO: checking for u_int16_t" >&5
-echo $ECHO_N "checking for u_int16_t... $ECHO_C" >&6
-if test "${ac_cv_type_u_int16_t+set}" = set; then
+  echo "$as_me:$LINENO: checking for uint16_t" >&5
+echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6
+if test "${ac_cv_type_uint16_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -6065,9 +6066,9 @@ $ac_includes_default
 int
 main ()
 {
-if ((u_int16_t *) 0)
+if ((uint16_t *) 0)
   return 0;
-if (sizeof (u_int16_t))
+if (sizeof (uint16_t))
   return 0;
   ;
   return 0;
@@ -6094,23 +6095,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_type_u_int16_t=yes
+  ac_cv_type_uint16_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_u_int16_t=no
+ac_cv_type_uint16_t=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5
-echo "${ECHO_T}$ac_cv_type_u_int16_t" >&6
-if test $ac_cv_type_u_int16_t = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
+echo "${ECHO_T}$ac_cv_type_uint16_t" >&6
+if test $ac_cv_type_uint16_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define u_int16_t unsigned int
+#define uint16_t unsigned int
 _ACEOF
 
 fi
@@ -6181,9 +6182,9 @@ _ACEOF
 
 fi
 
-  echo "$as_me:$LINENO: checking for u_int16_t" >&5
-echo $ECHO_N "checking for u_int16_t... $ECHO_C" >&6
-if test "${ac_cv_type_u_int16_t+set}" = set; then
+  echo "$as_me:$LINENO: checking for uint16_t" >&5
+echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6
+if test "${ac_cv_type_uint16_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -6196,9 +6197,9 @@ $ac_includes_default
 int
 main ()
 {
-if ((u_int16_t *) 0)
+if ((uint16_t *) 0)
   return 0;
-if (sizeof (u_int16_t))
+if (sizeof (uint16_t))
   return 0;
   ;
   return 0;
@@ -6225,23 +6226,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_type_u_int16_t=yes
+  ac_cv_type_uint16_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_u_int16_t=no
+ac_cv_type_uint16_t=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5
-echo "${ECHO_T}$ac_cv_type_u_int16_t" >&6
-if test $ac_cv_type_u_int16_t = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
+echo "${ECHO_T}$ac_cv_type_uint16_t" >&6
+if test $ac_cv_type_uint16_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define u_int16_t unsigned short
+#define uint16_t unsigned short
 _ACEOF
 
 fi
@@ -6317,9 +6318,9 @@ _ACEOF
 
 fi
 
-  echo "$as_me:$LINENO: checking for u_int32_t" >&5
-echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6
-if test "${ac_cv_type_u_int32_t+set}" = set; then
+  echo "$as_me:$LINENO: checking for uint32_t" >&5
+echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
+if test "${ac_cv_type_uint32_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -6332,9 +6333,9 @@ $ac_includes_default
 int
 main ()
 {
-if ((u_int32_t *) 0)
+if ((uint32_t *) 0)
   return 0;
-if (sizeof (u_int32_t))
+if (sizeof (uint32_t))
   return 0;
   ;
   return 0;
@@ -6361,23 +6362,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_type_u_int32_t=yes
+  ac_cv_type_uint32_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_u_int32_t=no
+ac_cv_type_uint32_t=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
-echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6
-if test $ac_cv_type_u_int32_t = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
+echo "${ECHO_T}$ac_cv_type_uint32_t" >&6
+if test $ac_cv_type_uint32_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define u_int32_t unsigned int
+#define uint32_t unsigned int
 _ACEOF
 
 fi
@@ -6448,9 +6449,9 @@ _ACEOF
 
 fi
 
-  echo "$as_me:$LINENO: checking for u_int32_t" >&5
-echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6
-if test "${ac_cv_type_u_int32_t+set}" = set; then
+  echo "$as_me:$LINENO: checking for uint32_t" >&5
+echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
+if test "${ac_cv_type_uint32_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -6463,9 +6464,9 @@ $ac_includes_default
 int
 main ()
 {
-if ((u_int32_t *) 0)
+if ((uint32_t *) 0)
   return 0;
-if (sizeof (u_int32_t))
+if (sizeof (uint32_t))
   return 0;
   ;
   return 0;
@@ -6492,23 +6493,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_type_u_int32_t=yes
+  ac_cv_type_uint32_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_u_int32_t=no
+ac_cv_type_uint32_t=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
-echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6
-if test $ac_cv_type_u_int32_t = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
+echo "${ECHO_T}$ac_cv_type_uint32_t" >&6
+if test $ac_cv_type_uint32_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define u_int32_t unsigned short
+#define uint32_t unsigned short
 _ACEOF
 
 fi
@@ -6579,9 +6580,9 @@ _ACEOF
 
 fi
 
-  echo "$as_me:$LINENO: checking for u_int32_t" >&5
-echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6
-if test "${ac_cv_type_u_int32_t+set}" = set; then
+  echo "$as_me:$LINENO: checking for uint32_t" >&5
+echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
+if test "${ac_cv_type_uint32_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -6594,9 +6595,9 @@ $ac_includes_default
 int
 main ()
 {
-if ((u_int32_t *) 0)
+if ((uint32_t *) 0)
   return 0;
-if (sizeof (u_int32_t))
+if (sizeof (uint32_t))
   return 0;
   ;
   return 0;
@@ -6623,23 +6624,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_type_u_int32_t=yes
+  ac_cv_type_uint32_t=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_type_u_int32_t=no
+ac_cv_type_uint32_t=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
-echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6
-if test $ac_cv_type_u_int32_t = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
+echo "${ECHO_T}$ac_cv_type_uint32_t" >&6
+if test $ac_cv_type_uint32_t = yes; then
   :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define u_int32_t unsigned long
+#define uint32_t unsigned long
 _ACEOF
 
 fi
@@ -7864,8 +7865,9 @@ fi
 echo "$as_me:$LINENO: result: $unet_cv_sys_nonblocking_posix" >&5
 echo "${ECHO_T}$unet_cv_sys_nonblocking_posix" >&6
 if test $unet_cv_sys_nonblocking_posix = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define NBLOCK_POSIX 1
+
+cat >>confdefs.h <<\_ACEOF
+#define NBLOCK_POSIX
 _ACEOF
 
 else
@@ -7937,13 +7939,15 @@ fi
 echo "$as_me:$LINENO: result: $unet_cv_sys_nonblocking_bsd" >&5
 echo "${ECHO_T}$unet_cv_sys_nonblocking_bsd" >&6
 if test $unet_cv_sys_nonblocking_bsd = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define NBLOCK_BSD 1
+
+cat >>confdefs.h <<\_ACEOF
+#define NBLOCK_BSD
 _ACEOF
 
 else
-  cat >>confdefs.h <<\_ACEOF
-#define NBLOCK_SYSV 1
+
+cat >>confdefs.h <<\_ACEOF
+#define NBLOCK_SYSV
 _ACEOF
 
 fi
@@ -8001,8 +8005,9 @@ fi
 echo "$as_me:$LINENO: result: $unet_cv_sys_signal_posix" >&5
 echo "${ECHO_T}$unet_cv_sys_signal_posix" >&6
 if test $unet_cv_sys_signal_posix = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define POSIX_SIGNALS 1
+
+cat >>confdefs.h <<\_ACEOF
+#define POSIX_SIGNALS
 _ACEOF
 
 else
@@ -8066,13 +8071,15 @@ fi
 echo "$as_me:$LINENO: result: $unet_cv_sys_signal_bsd" >&5
 echo "${ECHO_T}$unet_cv_sys_signal_bsd" >&6
 if test $unet_cv_sys_signal_bsd = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define BSD_RELIABLE_SIGNALS 1
+
+cat >>confdefs.h <<\_ACEOF
+#define BSD_RELIABLE_SIGNALS
 _ACEOF
 
 else
-  cat >>confdefs.h <<\_ACEOF
-#define SYSV_UNRELIABLE_SIGNALS 1
+
+cat >>confdefs.h <<\_ACEOF
+#define SYSV_UNRELIABLE_SIGNALS
 _ACEOF
 
 fi