--- ./configure.in.org	Thu Jul 12 18:24:48 2001
+++ ./configure.in	Thu Jul 11 03:34:48 2002
@@ -32,37 +32,44 @@
 AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(mkdir rmdir seteuid strcspn strerror strspn strstr strtoul)
-AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket, ,
-	AC_MSG_WARN([couldn't find your socket() function])))
-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname, ,
-	AC_MSG_WARN([couldn't find your gethostbyname() function])))
-AC_CHECK_FUNC(crypt, , AC_CHECK_LIB(crypt, crypt, ,
-	AC_MSG_WARN([couldn't find your crypt() function])))
+AC_CHECK_FUNC(socket, [],
+	      AC_CHECK_LIB(socket, socket, [], AC_MSG_WARN([couldn't find your socket() function]))
+	      )
+AC_CHECK_FUNC(gethostbyname, [], 
+	      AC_CHECK_LIB(nsl, gethostbyname, [], AC_MSG_WARN([couldn't find your gethostbyname() function]))
+	      )
+AC_CHECK_FUNC(crypt, [], 
+	      AC_CHECK_LIB(crypt, crypt, [], AC_MSG_WARN([couldn't find your crypt() function]))
+	      )
 
 dnl Do strange debug stuff.
-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],if eval "test x$enable_debug = xyes"; then
-	CFLAGS="-g -Wall $CFLAGS"
-	AC_DEFINE(DEBUG)
-	AC_DEFINE(DEBUG_MEMORY)
-else
-	AC_CHECK_FUNCS(strdup vasprintf vsnprintf)
-fi,
-AC_CHECK_FUNCS(strdup vasprintf vsnprintf)
+AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],
+	      [if eval "test x$enable_debug = xyes"; then
+		      CFLAGS="-g -Wall $CFLAGS"
+		      AC_DEFINE(DEBUG)
+		      AC_DEFINE(DEBUG_MEMORY)
+	      else
+		      AC_CHECK_FUNCS(strdup vasprintf vsnprintf)
+	      fi],
+	      [AC_CHECK_FUNCS(strdup vasprintf vsnprintf)]
 )
 
 dnl Allow me to turn on/off poll and select to debug stuff
 AC_ARG_ENABLE(poll, [  --disable-poll          disable use of the poll() function [default=no]],
-if eval "test x$enable_poll = xyes"; then
-	AC_CHECK_FUNCS(poll)
-	AC_CHECK_HEADERS(poll.h sys/poll.h)
-fi,
-AC_CHECK_FUNCS(poll)
-AC_CHECK_HEADERS(poll.h sys/poll.h)
+	      [if eval "test x$enable_poll = xyes"; then
+		      AC_CHECK_FUNCS(poll)
+		      AC_CHECK_HEADERS(poll.h sys/poll.h)
+	      fi],
+	      [AC_CHECK_FUNCS(poll)
+	      AC_CHECK_HEADERS(poll.h sys/poll.h)]
 )
-AC_ARG_ENABLE(select, [  --disable-select        disable use of the select() function [default=no]], if eval "test x$enable_select = xyes"; then
-	AC_CHECK_FUNCS(select)
-fi,
-AC_CHECK_FUNCS(select)
+
+AC_ARG_ENABLE(select,
+	      [  --disable-select        disable use of the select() function [default=no]],
+	      [if eval "test x$enable_select = xyes"; then
+		      AC_CHECK_FUNCS(select)
+	      fi],
+	      [AC_CHECK_FUNCS(select)]
 )
 
 dnl Output the Makefiles.