Changeset 441


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/aclocal.m4

    r440 r441  
    409409x_libraries=NONE
    410410DESTDIR=
    411 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"
     411SH_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"
    412412SH_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"
    413413
     
    13141314        samhain_64=yes
    13151315        tiger_src=sh_tiger1_64.c
    1316         AC_DEFINE([TIGER_OPT_ASM],1,[Define to use tiger x86_64 optimized assembly])
     1316        samhain_64_asm=yes
    13171317        ],
    13181318        [
     
    13271327samhain_64=no
    13281328tiger_src=sh_tiger1.c
     1329samhain_64_asm=no
    13291330#
    13301331# if sizeof(unsigned long) = 4, try compiler macros for 64bit
  • trunk/configure.ac

    r440 r441  
    1212dnl start
    1313dnl
    14 AM_INIT_AUTOMAKE(samhain, 3.0.13)
     14AM_INIT_AUTOMAKE(samhain, 3.0.14pre)
    1515AC_DEFINE([SAMHAIN], 1, [Application is samhain])
    1616AC_CANONICAL_HOST
     
    16551655AC_SUBST(mydebugdef)
    16561656
     1657sh_enable_asm=yes
     1658AC_ARG_ENABLE(asm,
     1659        [  --disable-asm                        disable asm inline code],
     1660        [
     1661        if test "x${enable_asm}" = xno; then
     1662            sh_enable_asm=no
     1663        fi
     1664        ]
     1665)
     1666
     1667if test "x${samhain_64_asm}" = xyes; then
     1668        if test "x${sh_enable_asm}" = xyes; then
     1669           AC_DEFINE([TIGER_OPT_ASM],1,[Define to use tiger x86_64 optimized assembly])
     1670        fi
     1671fi
    16571672
    16581673AC_ARG_ENABLE(ipv6,
  • trunk/docs/Changelog

    r440 r441  
    1         * Fix IgnoreAdded to anchor regex at beginning of path (reported by R.Lindner)
    2         * Add check to detect availability of pmap_getmaps() (missing in static library
    3           on recent Linux systems as reported by Ian Baldwin)
     1        * Fix IgnoreAdded to anchor regex at beginning of path (reported by
     2          R.Lindner)
     3        * Add check to detect availability of pmap_getmaps() (missing in
     4          static library on recent Linux systems as reported by Ian Baldwin)
    45        * Fixes for Ubuntu 13.4:
    5                 - no error msg for failing stat on /run/user/Username/gvfs in suidcheck
    6                 - no error message for failing hardlink check on /run/user/Username
    7                 - eliminate compiler warnings
     6          - no error msg for failing stat on /run/user/Username/gvfs in
     7            suidcheck
     8          - no error message for failing hardlink check on /run/user/Username
     9          - eliminate compiler warnings
     10        * Add option '--disable-asm' to work around a gcc issue in Debian
     11          unstable (reported by micah)
    812
    9133.0.13:
Note: See TracChangeset for help on using the changeset viewer.