Index: /trunk/configure.ac
===================================================================
--- /trunk/configure.ac	(revision 96)
+++ /trunk/configure.ac	(revision 97)
@@ -2407,5 +2407,5 @@
 echo "ac_cv_sizeof_char_p         size of pointer to char ${ac_cv_sizeof_char_p}"
 echo "ac_cv_sizeof_char_p         size of size_t          ${ac_cv_sizeof_size_t}"
-echo "ac_cv_sizeof_unsigned_int_  size of unsigned int    ${ac_cv_sizeof_unsigned_int_}"
+echo "ac_cv_sizeof_unsigned_int   size of unsigned int    ${ac_cv_sizeof_unsigned_int}"
 echo "ac_cv_sizeof_unsigned_long  size of unsigned long   ${ac_cv_sizeof_unsigned_long}"
 echo "ac_cv_sizeof_unsigned_short size of unsigned short  ${ac_cv_sizeof_unsigned_short}"
Index: /trunk/src/sh_database.c
===================================================================
--- /trunk/src/sh_database.c	(revision 96)
+++ /trunk/src/sh_database.c	(revision 97)
@@ -1100,5 +1100,10 @@
        * to lack of access permission is not reported).
        */
+#if !defined(__x86_64__)
+      /* 
+       *   libmysql segfaults on x86-64 if this is used
+       */
       mysql_options(db_conn, MYSQL_READ_DEFAULT_GROUP, _("samhain"));
+#endif
 
       status = 0;
Index: /trunk/test/testrun_1b.sh
===================================================================
--- /trunk/test/testrun_1b.sh	(revision 96)
+++ /trunk/test/testrun_1b.sh	(revision 97)
@@ -246,11 +246,8 @@
 	    # -------------  third test -------------
 	    #
-	    if test "x$hostname" = "xtenebra"
+	    if test -f /usr/local/lib/libprelude.so
 	    then
-		if test -f /usr/local/lib/libprelude.so
-		then
 		    LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
 		    export LD_LIBRARY_PATH
-		fi
 	    fi
 	    #