Index: /trunk/aclocal.m4
===================================================================
--- /trunk/aclocal.m4	(revision 440)
+++ /trunk/aclocal.m4	(revision 441)
@@ -409,5 +409,5 @@
 x_libraries=NONE
 DESTDIR=
-SH_ENABLE_OPTS="ssp db-reload xml-log message-queue login-watch process-check port-check mounts-check logfile-monitor userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc ipv6 shellexpand suid"
+SH_ENABLE_OPTS="asm ssp db-reload xml-log message-queue login-watch process-check port-check mounts-check logfile-monitor userfiles debug ptrace static network udp nocl stealth micro-stealth install-name identity khide suidcheck base largefile mail external-scripts encrypt srp dnmalloc ipv6 shellexpand suid"
 SH_WITH_OPTS="prelude libprelude-prefix database libwrap cflags libs console altconsole timeserver alttimeserver rnd egd-socket port logserver altlogserver kcheck gpg keyid checksum fp recipient sender trusted tmp-dir config-file log-file pid-file state-dir data-file html-file"
 
@@ -1314,5 +1314,5 @@
 	samhain_64=yes
 	tiger_src=sh_tiger1_64.c
-	AC_DEFINE([TIGER_OPT_ASM],1,[Define to use tiger x86_64 optimized assembly])
+	samhain_64_asm=yes
 	],
 	[
@@ -1327,4 +1327,5 @@
 samhain_64=no
 tiger_src=sh_tiger1.c
+samhain_64_asm=no
 #
 # if sizeof(unsigned long) = 4, try compiler macros for 64bit
Index: /trunk/configure.ac
===================================================================
--- /trunk/configure.ac	(revision 440)
+++ /trunk/configure.ac	(revision 441)
@@ -12,5 +12,5 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 3.0.13)
+AM_INIT_AUTOMAKE(samhain, 3.0.14pre)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST
@@ -1655,4 +1655,19 @@
 AC_SUBST(mydebugdef)
 
+sh_enable_asm=yes
+AC_ARG_ENABLE(asm,
+        [  --disable-asm			disable asm inline code],
+        [
+        if test "x${enable_asm}" = xno; then
+	    sh_enable_asm=no
+	fi
+	]
+)
+
+if test "x${samhain_64_asm}" = xyes; then
+   	if test "x${sh_enable_asm}" = xyes; then
+	   AC_DEFINE([TIGER_OPT_ASM],1,[Define to use tiger x86_64 optimized assembly])
+	fi
+fi
 
 AC_ARG_ENABLE(ipv6,
Index: /trunk/docs/Changelog
===================================================================
--- /trunk/docs/Changelog	(revision 440)
+++ /trunk/docs/Changelog	(revision 441)
@@ -1,9 +1,13 @@
-	* Fix IgnoreAdded to anchor regex at beginning of path (reported by R.Lindner)
-	* Add check to detect availability of pmap_getmaps() (missing in static library
-	  on recent Linux systems as reported by Ian Baldwin)
+	* Fix IgnoreAdded to anchor regex at beginning of path (reported by 
+	  R.Lindner)
+	* Add check to detect availability of pmap_getmaps() (missing in 
+	  static library on recent Linux systems as reported by Ian Baldwin)
 	* Fixes for Ubuntu 13.4:
-		- no error msg for failing stat on /run/user/Username/gvfs in suidcheck
-		- no error message for failing hardlink check on /run/user/Username
-		- eliminate compiler warnings
+	  - no error msg for failing stat on /run/user/Username/gvfs in 
+	    suidcheck
+	  - no error message for failing hardlink check on /run/user/Username
+	  - eliminate compiler warnings
+	* Add option '--disable-asm' to work around a gcc issue in Debian
+	  unstable (reported by micah)
 
 3.0.13: