Changeset 441 for trunk

Timestamp:

Sep 29, 2013, 5:55:24 PM (11 years ago)

Author:

katerina

Message:

Fix for ticket #345 (compile error on Debian unstable, gcc 4.8).

Location:

trunk

Files:

• aclocal.m4 (modified) (3 diffs)
• configure.ac (modified) (2 diffs)
• docs/Changelog (modified) (1 diff)

trunk/aclocal.m4

@@ -409 +409 @@
 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 +1314 @@
         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 +1327 @@
 samhain_64=no
 tiger_src=sh_tiger1.c
+samhain_64_asm=no
 #
 # if sizeof(unsigned long) = 4, try compiler macros for 64bit

trunk/configure.ac

@@ -12 +12 @@
 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 +1655 @@
 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,

trunk/docs/Changelog

@@ -1 @@
-        * 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: