--- GNUnet/configure.in	2003-01-16 11:56:41.000000000 +1100
+++ GNUnet.cvs/configure.in	2003-01-16 08:56:32.000000000 +1100
@@ -1,28 +1,21 @@
-# Process this file with autoconf to produce a configure script.
-
+dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
-AC_INIT([GNUnet],[0.5.0b],address@hidden)
-AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE
+AC_INIT(GNUnet, 0.5.0b, address@hidden)
 AC_CONFIG_HEADER(src/include/autodefs.h)
 
-# Checks for programs.
-AC_PROG_CXX
+dnl Checks for programs.
 AC_PROG_AWK
-AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-AC_PROG_LIBTOOL
 
-# Check for headers, LEAVE sys/time.h!
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h gcrypt.h libintl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/file.h sys/ioctl.h sys/socket.h sys/time.h unistd.h])
+dnl Check for headers, LEAVE sys/time.h!
+AC_CHECK_HEADERS(fcntl.h limits.h strings.h unistd.h sys/time.h sys/ioctl.h netdb.h netinet/in.h sys/file.h sys/socket.h gcrypt.h)
 
-# Check system type
+dnl Check system type
+AC_CANONICAL_HOST
 CFLAGS="-Wall $CFLAGS"
 
 case "$host_os" in
@@ -57,6 +50,9 @@
      ;;
 esac
 
+AM_INIT_AUTOMAKE
+AM_PROG_LIBTOOL
+
 AM_GNUNET_SSL_VERSION()
 
 AC_MSG_CHECKING(where crypto development files are)
@@ -108,7 +104,7 @@
 
 AM_CONDITIONAL(HAVE_DIRECTORY, test xtrue = xtrue)
 
-# Replace `main' with a function in -lpthread:
+dnl Replace `main' with a function in -lpthread:
 AC_CHECK_LIB(pthread, pthread_create)
 AC_CHECK_LIB(nsl, gethostbyname)
 AC_CHECK_LIB(socket, socket)
@@ -154,28 +150,30 @@
        AC_MSG_RESULT(Could not find gettextlib))],
     [AC_MSG_RESULT(no)]
 )
+dnl Checks for header files.
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_HEADER_TIME
 
-# Checks for typedefs, structures, and compiler characteristics.
+dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
 
-# Checks for library functions.
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_FORK
-AC_FUNC_GETLOADAVG
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MALLOC
+dnl Checks for library functions.
 AC_FUNC_MEMCMP
-# AC_FUNC_MMAP
-AC_FUNC_SELECT_ARGTYPES
+AC_FUNC_MMAP
 AC_TYPE_SIGNAL
-AC_FUNC_STAT
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([dup2 fdatasync gethostbyname gettimeofday memset mkdir mkfifo select socket strcasecmp strchr strdup strerror strstr])
+AC_FUNC_FORK
+AC_FUNC_SELECT_ARGTYPES
+AC_FUNC_MALLOC
+AC_FUNC_STAT
+AC_FUNC_CLOSEDIR_VOID
+AC_CHECK_FUNCS(gettimeofday mkdir mkfifo select socket strdup strerror strstr fdatasync dup2 gethostbyname memset strchr strcasecmp)
 
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
@@ -186,7 +184,7 @@
 AM_CONDITIONAL(HAVE_EXTRACT, test $ac_cv_lib_extractor_EXTRACTOR_loadDefaultLibraries != no)
 
 
-AC_CONFIG_FILES([Makefile 
+AC_OUTPUT(Makefile 
 src/applications/afs/database/Makefile 
 src/applications/afs/encoding/Makefile 
 src/applications/afs/gtkui/Makefile 
@@ -219,5 +217,4 @@
 src/test/Makefile 
 src/transports/Makefile 
 src/util/Makefile 
-])
-AC_OUTPUT
+)