diff --exclude='*~' --exclude='.*' -I '$Id:' -urN flow-tools-0.68.orig/acconfig.h flow-tools-0.68/acconfig.h
--- flow-tools-0.68.orig/acconfig.h	2005-05-05 23:31:14.000000000 -0400
+++ flow-tools-0.68/acconfig.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,28 +0,0 @@
-
-/* Name of package.  */
-#undef PACKAGE
-
-/* Version of package.  */
-#undef VERSION
-
-/* Linux */
-#undef _BSD_SOURCE
-
-/* Linux */
-#undef HAVE_FEATURES_H
-
-/* BSD socket */
-#undef HAVE_SOCK_SIN_LEN
-
-/* MYSQL */
-#undef HAVE_MYSQL
-
-/* PGSQL */
-#undef HAVE_PGSQL
-
-/* DEC */
-#undef HAVE_LL_STRTOUL
-
-/* OPENSSL */
-#undef HAVE_OPENSSL
-
diff --exclude='*~' --exclude='.*' -I '$Id:' -urN flow-tools-0.68.orig/configure.in flow-tools-0.68/configure.in
--- flow-tools-0.68.orig/configure.in	2005-05-11 10:15:48.000000000 -0400
+++ flow-tools-0.68/configure.in	2005-05-13 23:47:20.000000000 -0400
@@ -28,77 +28,57 @@
 AC_SUBST(OPENSSLINCLUDE)
 
 dnl extra argument: --with-mysql
-WITH_MYSQL=
 AC_ARG_WITH(mysql,
-[  --with-mysql[=PATH]           Compile in MySQL support. (default=no)],
-[ if test -x "$withval"; then
-    WHERE_MYSQL=$withval
-  else
-    WHERE_MYSQL="/usr"
-  fi
-]
-)
+    [ --with-mysql	Compile in MySQL support (default=no)],
+    [ac_with_mysql=$withval],
+    [ac_with_mysql=no])
+
+if test x$ac_with_mysql = xyes ; then
+    LIBS="-L/usr/lib/mysql"
+    AC_CHECK_LIB(mysqlclient, my_init,
+	[
+	 MYSQLCFLAGS="-L/usr/lib/mysql -I/usr/include/mysql"
+	 MYSQLLIB="-lmysqlclient"
+	 AC_DEFINE([HAVE_MYSQL], 1, [Compile MySQL support])
+	]
+    )
+fi
 
 dnl extra argument: --with-pgsql
-WITH_PGSQL=
 AC_ARG_WITH(pgsql,
-[  --with-pgsql[=PATH]           Compile in PostgreSQL support. (default=no)],
-[ if test -x "$withval"; then
-    WHERE_PGSQL=$withval
-  else
-    WHERE_PGSQL="/usr"
-  fi
-]
-)
+    [ --with-pgsql	Compile in PostgreSQL support (default=no)],
+    [ac_with_pgsql=$withval],
+    [ac_with_pgsql=no])
+
+if test x$ac_with_pgsql = xyes ; then
+    LIBS="-L/usr/lib/postgresql"
+    AC_CHECK_LIB(pq, PQsetdbLogin,
+	[
+	 PGSQLCFLAGS="-L/usr/lib/postgresql -I/usr/include/postgresql"
+	 PGSQLLIB="-lpq"
+	 AC_DEFINE([HAVE_PGSQL], 1, [Compile PostgreSQL support])
+	]
+    )
+fi
 
 dnl extra argument: --with-openssl
-WITH_OPENSSL=
 AC_ARG_WITH(openssl,
-[  --with-openssl[=PATH]           Compile in OpenSSL support. (default=no)],
-[ if test -x "$withval"; then
-    WHERE_OPENSSL=$withval
-  else
-    WHERE_OPENSSL="/usr"
-  fi
-]
-)
-
-dnl Checks for libraries.
+    [ --with-openssl	    Compile in OpenSSL support (default=no)],
+    [ac_with_openssl=$withval],
+    [ac_with_openssl=no])
 
-if test "x$WHERE_MYSQL" != "x"; then
-  LIBS="-L$WHERE_MYSQL/lib/mysql"
-  AC_CHECK_LIB(mysqlclient, my_init,
-    [
-      MYSQLCFLAGS="-L$WHERE_MYSQL/lib/mysql -I$WHERE_MYSQL/include/mysql"
-      MYSQLLIB="-lmysqlclient"
-      AC_DEFINE(HAVE_MYSQL)
-    ]
-  )
-fi
-
-if test "x$WHERE_OPENSSL" != "x"; then
-  LIBS="-L$WHERE_OPENSSL/lib"
+if test x$ac_with_openssl = xyes ; then
+  LIBS="-L/usr/lib"
   AC_CHECK_LIB(crypto, EVP_EncryptUpdate,
     [
-      OPENSSLCFLAGS="-L$WHERE_OPENSSL/lib -I$WHERE_OPENSSL/include"
+      OPENSSLCFLAGS="-L/usr/lib -I/usr/include"
       CRYPTOLIB="-lcrypto"
-      AC_DEFINE(HAVE_OPENSSL)
-    ]
-  )
-fi
-
-
-if test "x$WHERE_PGSQL" != "x"; then
-  LIBS="-L$WHERE_PGSQL/lib/pgsql"
-  AC_CHECK_LIB(pq, PQsetdbLogin,
-    [
-      PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include/pgsql"
-      PGSQLLIB="-lpq"
-      AC_DEFINE(HAVE_PGSQL)
+      AC_DEFINE([HAVE_OPENSSL], 1, [Compile OpenSSL support])
     ]
   )
 fi
 
+dnl Checks for libraries.
 AC_CHECK_LIB(y, main,YLIB="$YLIB -ly",)
 AC_CHECK_LIB(z, zlibVersion)
 case "X$LIBS" in
@@ -121,11 +101,11 @@
 #include <sys/socket.h>
 #include <netinet/in.h>],
 [struct sockaddr_in sock; sock.sin_len = sizeof(sock);],
-echo yes;AC_DEFINE(HAVE_SOCK_SIN_LEN), 
+echo yes;AC_DEFINE([HAVE_SOCK_SIN_LEN], 1, [Define if sockaddr_in.sin_len member exists]), 
 echo no)
 
 
-AC_DEFINE(_BSD_SOURCE)
+AC_DEFINE([_BSD_SOURCE], 1, [Define BSD source])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -162,7 +142,7 @@
 }
 ],
 [AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_LL_STRTOUL)
+  AC_DEFINE([HAVE_LL_STRTOUL], 1, [Define if strtoul returns 64 bits])
 ],
 [AC_MSG_RESULT(no)],
 )