--- configure.in.orig	2004-12-09 20:44:49.000000000 +0100
+++ configure.in	2004-12-24 03:14:11.471172608 +0100
@@ -126,6 +126,31 @@
     extra_incl=-I/sw/include
 esac
 
+case $host in
+*-*-linux*)
+  # Test if the compiler is 64bit
+  echo 'int i;' > conftest.$ac_ext
+  snort_cv_cc_64bit_output=no
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *"ELF 64"*)
+     snort_cv_cc_64bit_output=yes
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+case $host_cpu:$snort_cv_cc_64bit_output in
+powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+  snort_libname="lib64"
+  ;;
+*:*)
+  snort_libname="lib"
+  ;;
+esac
+
 # any sparc platform has to have this one defined.
 AC_MSG_CHECKING(for sparc alignment)
 if eval "echo $host_cpu|grep -i sparc >/dev/null"; then
@@ -406,7 +431,7 @@
     fi
   else
 
-    for i in lib lib/mysql; do
+		for i in $snort_libname $snort_libname/mysql; do
       str="$MYSQL_DIR/$i/libmysqlclient.*"
       for j in `echo $str`; do
         if test -r $j; then
@@ -419,7 +444,7 @@
     if test -z "$MYSQL_LIB_DIR"; then
       if test "$mysql_fail" != "no"; then
         FAIL_MESSAGE("mysqlclient library", 
-                     "$MYSQL_DIR/lib $MYSQL_DIR/lib/mysql")
+                     "$MYSQL_DIR/$snort_libname $MYSQL_DIR/$snort_libname/mysql")
       else
         AC_MSG_RESULT(no)
       fi
@@ -473,19 +498,19 @@
     fi
   else
 
-    str="$ODBC_DIR/lib/libodbc.*"
+		str="$ODBC_DIR/$snort_libname/libodbc.*"
     for j in `echo $str`; do
       if test -r $j; then 
-        ODBC_LIB_DIR="$ODBC_DIR/lib"
+        ODBC_LIB_DIR="$ODBC_DIR/$snort_libname"
         ODBC_LIB="odbc"
       fi
     done
 
 dnl    if test -z "$ODBC_LIB_DIR"; then
-dnl      str="$ODBC_DIR/lib/libiodbc.*"
+dnl      str="$ODBC_DIR/$snort_libname/libiodbc.*"
 dnl      for j in `echo $str`; do
 dnl        if test -r $j; then 
-dnl          ODBC_LIB_DIR="$ODBC_DIR/lib"
+dnl          ODBC_LIB_DIR="$ODBC_DIR/$snort_libname"
 dnl          ODBC_LIB="iodbc"
 dnl        fi
 dnl      done
@@ -493,7 +518,7 @@
 
     if test -z "$ODBC_LIB_DIR"; then
       if test "$odbc_fail" != "no"; then
-        FAIL_MESSAGE("odbc library (libodbc)", "$ODBC_DIR/lib")
+				FAIL_MESSAGE("odbc library (libodbc)", "$ODBC_DIR/$snort_libname")
       else
         AC_MSG_RESULT(no)
       fi
@@ -550,7 +575,7 @@
     fi
   else
 
-    for i in lib lib/pgsql; do
+		for i in $snort_libname $snort_libname/pgsql; do
       str="$POSTGRESQL_DIR/$i/libpq.*"
       for j in `echo $str`; do
         if test -r $j; then
@@ -563,7 +588,7 @@
     if test -z "$POSTGRESQL_LIB_DIR"; then
       if test "$postgresql_fail" != "no"; then
         FAIL_MESSAGE("postgresql library libpq",
-        "$POSTGRESQL_DIR/lib $POSTGRESQL_DIR/lib/pgsql")
+				"$POSTGRESQL_DIR/$snort_libname $POSTGRESQL_DIR/$snort_libname/pgsql")
       else
         AC_MSG_RESULT(no);
       fi
@@ -616,7 +641,7 @@
     for i in rdbms/demo rdbms/public network/public; do
       ORACLE_CPP_FLAGS="$ORACLE_CPP_FLAGS -I$ORACLE_DIR/$i"
     done
-    ORACLE_LIB_DIR="$ORACLE_DIR/lib"
+		ORACLE_LIB_DIR="$ORACLE_DIR/$snort_libname"
     AC_MSG_RESULT(yes)
 
     LDFLAGS="${LDFLAGS} -L${ORACLE_LIB_DIR}"
@@ -717,7 +742,7 @@
 if test "$enable_flexresp" != "no" -a "$enable_flexresp" = "yes"; then
 
   if test `libnet-config --cflags | wc -c` = "1"; then
-    CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
+    CPPFLAGS="${CPPFLAGS}"
     LIBNET_CONFIG_BROKEN_CFLAGS=yes
   fi
 
@@ -725,7 +750,7 @@
     AC_MSG_WARN(libnet-config --libs is broken on your system.  If you)
     AC_MSG_WARN(are using a precompiled package please notify the) 
     AC_MSG_WARN(maintainer.)
-    LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/sw/lib"
+    LDFLAGS="${LDFLAGS}"
     LIBS="${LIBS} -lnet"
   fi