Changeset 481 for trunk/configure.ac

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/configure.ac (modified) (17 diffs)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 3.1.6)
+AM_INIT_AUTOMAKE(samhain, 4.0.0.rc1)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST
@@ -40 +40 @@
 
 AC_HEADER_STDC
-dnl
-dnl first one is a dummy because of an autoconf bug
-dnl (no HAVE_... for first one)
-dnl 
-AC_CHECK_HEADERS([sys/ipc.h sys/msg.h sys/uio.h fcntl.h])
+
+AC_CHECK_HEADERS([sys/ipc.h sys/sem.h sys/msg.h sys/uio.h fcntl.h])
 
 
@@ -395 +392 @@
 )
 AC_CHECK_FUNC(statfs, AC_DEFINE(HAVE_STATFS) statfs="yes",  statfs="no")
-AC_CHECK_VA_COPY
+SL_CHECK_VA_COPY
 AC_CHECK_FUNCS(vsnprintf, [SL_CHECK_VSNPRINTF])
 AC_CHECK_MLOCK
@@ -532 +529 @@
 SH_CHECK_TYPEDEF(long long, HAVE_LONG_LONG)
 SH_CHECK_TYPEDEF(uint16_t, HAVE_UINT16_T)
+SH_CHECK_TYPEDEF(uint32_t, HAVE_UINT32_T)
 SH_CHECK_TYPEDEF(uint64_t, HAVE_UINT64_T)
 if test "$sh_HAVE_LONG_LONG" = "yes"; then
@@ -946 +944 @@
                 mytclient="-DSH_WITH_CLIENT"
                 yulectl_prg=
+                samhainadmin_prg=
                 setpwd_prg="samhain_setpwd"
                 sh_main_prg="samhain"
@@ -958 +957 @@
                 mytclient="-DSH_WITH_SERVER"
                 yulectl_prg="yulectl"
+                samhainadmin_prg="scripts/samhainadmin.pl"
                 setpwd_prg="samhain_setpwd"
                 sh_main_prg="yule"
@@ -968 +968 @@
                 mytclient="-DSH_STANDALONE"
                 yulectl_prg=
+                samhainadmin_prg=
                 setpwd_prg=
                 sh_main_prg="samhain"
@@ -981 +982 @@
         setpwd_prg=
         yulectl_prg=
+        samhainadmin_prg=
         sh_main_prg="samhain"
 dnl     AC_CHECK_HEADER(sys/capability.h, 
@@ -990 +992 @@
 AC_SUBST(setpwd_prg)
 AC_SUBST(yulectl_prg)
+AC_SUBST(samhainadmin_prg)
 AC_SUBST(sh_main_prg)
 AC_SUBST(mytclient)
@@ -1013 +1016 @@
                   LIBS="${tmp_LIBS}"
                 fi
-                AC_DEFINE(SH_COMPILE_STATIC, 1, [Define if compiling static])
-                if test "x$GCC" = "xyes"; then
-                        sh_no_gcc_static=no
-                        LDFLAGS="$LDFLAGS -static"
+
+                if test "x$GCC" = "xyes"; 
+                then
+                   case "$host_os" in
+
+                        *solaris*)
+                                AC_MSG_WARN([option --enable-static ignored on Solaris])
+                                ;;
+                        
+                        *)
+                                AC_DEFINE(SH_COMPILE_STATIC, 1, [Define if compiling static])
+                                sh_no_gcc_static=no
+                                LDFLAGS="$LDFLAGS -static"
+                                ;;
+                    esac
                 else
+                   AC_DEFINE(SH_COMPILE_STATIC, 1, [Define if compiling static])
                    sh_no_gcc_static=yes
                    case "$host_os" in
@@ -1744 +1759 @@
   fi
 
-dnl  if test ! -z "`echo "$CFLAGS" | grep "\-O2" 2> /dev/null`" ; then
-dnl    CFLAGS=`echo $CFLAGS | sed 's%\-O2%\-O3%' `
-dnl  fi
-
+dnl  -W is the older name for -Wextra
+
+  
   if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
-    CFLAGS="$CFLAGS -Wall -W "
+     case "$host_os" in
+        *solaris*)
+           CFLAGS="$CFLAGS -Wall -W -Wno-missing-braces "
+           ;;
+        *)
+           CFLAGS="$CFLAGS -Wall -W "
+           ;;
+     esac
   fi
 
@@ -1864 +1885 @@
         if test "x${enable_encrypt}" = xno; then
            myencrypt=no
-        elif test "x${enable_encrypt}" = "x1"; then
-           myencrypt=1  
         fi
         ]
@@ -1872 +1891 @@
         AC_DEFINE(SH_ENCRYPT)
         AC_DEFINE(SH_ENCRYPT_2)
-elif test "x${myencrypt}" = "x1"; then
-        AC_DEFINE(SH_ENCRYPT)
 fi
 
@@ -2068 +2085 @@
 AC_SUBST(need_user_install)
 
-sh_insmod_cmd=": # no kernel module"
-sh_insmod_pre=": # no kernel module"
-sh_lkm=""
-lkm_inc=""
-khidemap="/boot/System.map"
-sh_syscalltable="0x0"
-AC_ARG_ENABLE(khide,
-        [  --enable-khide=SYSTEM_MAP    use kernel module to hide (Linux only)[[/boot/System.map]]],
-        [
-        if test "x${enable_khide}" != xno; then
-
-           kernel_testsupport=`uname -r | sed s,^3.*,LINUX3,`
-           if test "x${kernel_testsupport}" = "xLINUX3"; then
-              AC_MSG_ERROR([The --enable-khide option is not supported on Linux kernel version 3.x or above.])
-           fi
-
-           if test "x${enableval}" != "xyes"; then
-                khidemap="${enableval}"
-           fi
-           sh_syscalltable=`egrep '(D|d|R|r) sys_call_table' ${khidemap} | awk '{print $1}'`
-           if test x"$sh_syscalltable" = x; then
-                AC_MSG_ERROR([Option --enable-khide cannot be used since the symbol sys_call_table was not found in ${khidemap}.])
-           fi
-           sh_syscalltable="0x${sh_syscalltable}"
-           install_name_len=`echo ${install_name} | awk '{ print(length()); }'`
-           if test "${install_name_len}" -gt 15 ; then
-                AC_MSG_ERROR([If --enable-khide is used, install_name must not exceed a length of 15 chars.])
-           fi
-           AC_DEFINE(SH_USE_LKM)
-           AC_DEFINE_UNQUOTED(SH_MAGIC_HIDE, "${install_name}")
-
-           # -- NEW --
-           kernel_version=`uname -r | sed s,2.6.*,LINUX26,`
-           kernel_numeric=`uname -r | sed 's%-%.%g' | sed 's%_%.%g' | awk -F. '{ print $1*65536+$2*256+$3 }'`
-           AC_DEFINE_UNQUOTED(SH_KERNEL_NUMERIC, ${kernel_numeric}, [Kernel number])
-
-           if test x"$kernel_version" = xLINUX26
-           then
-                AC_MSG_CHECKING([for modlist_lock])
-                sh_modlist_lock=`egrep ['[bd] modlist_lock$'] ${khidemap} | awk '{print $1}'` 
-                if test x"$sh_modlist_lock" = x; then
-                        AC_MSG_RESULT(no)
-                else
-                        sh_modlist_lock="0x${sh_modlist_lock}"
-                        AC_MSG_RESULT([${sh_modlist_lock}])
-                        AC_DEFINE_UNQUOTED(SH_MODLIST_LOCK, ${sh_modlist_lock}, [The address of the modules list spinlock])
-                fi
-
-                AC_MSG_CHECKING([for module_mutex])                 
-                sh_modlist_mutex=`egrep ['[bd] module_mutex$'] ${khidemap} | awk '{print $1}'` 
-                if test x"$sh_modlist_mutex" = x; then
-                        AC_MSG_RESULT(no)
-                else
-                        sh_modlist_mutex="0x${sh_modlist_mutex}"
-                        AC_MSG_RESULT([${sh_modlist_mutex}])
-                        AC_DEFINE_UNQUOTED(SH_MODLIST_MUTEX, ${sh_modlist_mutex}, [The address of the modules list mutex])
-                fi
-
-                sh_list_modules=`egrep 'd modules$' ${khidemap} | awk '{print $1}'` 
-                if test x"$sh_list_modules" = x; then
-                        AC_MSG_ERROR([Option --enable-khide cannot be used, since the symbol modules was not found in ${khidemap}.])
-                fi
-                sh_list_modules="0x${sh_list_modules}"
-                AC_DEFINE_UNQUOTED(SH_LIST_MODULES, ${sh_list_modules}, [The address of the modules list])
-
-                AC_DEFINE(LINUX26, 1, [Define if kernel is 2.6])
-                sh_insmod_cmd="modprobe ${install_name}_hide"
-                sh_lkm="samhain_hide.ko"
-           else
-                sh_insmod_cmd="insmod ${install_name}_hide; insmod ${install_name}_erase; rmmod ${install_name}_erase"
-                sh_lkm="samhain_hide.o samhain_erase.o"
-           fi
-           # -- END NEW --
-
-           kvers=`uname -r`
-           if test -f /lib/modules/${kvers}/build/include/linux/kernel.h; then
-                lkm_inc="-I/lib/modules/${kvers}/build/include"
-           else
-                AC_MSG_WARN([--enable-khide: /lib/modules/${kvers}/build/include/linux not found])
-                AC_MSG_WARN([--enable-khide: You may need to install the kernel-source])
-                AC_MSG_WARN([--enable-khide: headers for the currently-running kernel.])
-           fi
-
-           AC_MSG_CHECKING([for 2.4 vanilla kernel])
-           sh_is_vanilla_kernel=yes
-           if test -f /lib/modules/${kvers}/build/include/linux/sched.h; then
-                grep 'next_task,' /lib/modules/${kvers}/build/include/linux/sched.h  >/dev/null 2>&1 || sh_is_vanilla_kernel=no
-           fi
-           if test x"${sh_is_vanilla_kernel}" = xno; then
-                AC_MSG_RESULT(no)
-           else
-                AC_MSG_RESULT(yes)
-                AC_DEFINE(SH_VANILLA_KERNEL)
-           fi
-
-        fi
-        ]
-)
-
 AC_SUBST(install_name)
 AC_SUBST(INSTALL_NAME)
@@ -2194 +2112 @@
 )
 
-
-systemmap="/boot/System.map"
-sh_libkvm=""
-AC_ARG_WITH(kcheck,
-        [  --with-kcheck[[=SYSTEM_MAP]] check Linux/FreeBSD/OpenBSD kernel integrity [[/boot/System.map]]],
-        [
-        if test "x${withval}" != "xno"; then 
-                AC_DEFINE(SH_USE_KERN)
-
-                kernel_numeric=`uname -r | sed 's%-%.%g' | sed 's%_%.%g' | awk -F. '{ print $1*65536+$2*256+$3 }'`
-                AC_DEFINE_UNQUOTED(SH_KERNEL_NUMBER, ${kernel_numeric}, [Kernel number])
-
-                kernelversion=`uname -r`
-                AC_DEFINE_UNQUOTED(SH_KERNEL_VERSION, _("${kernelversion}"), [Define the kernel version])
-
-                if test "x${withval}" != "xyes"; then
-                        systemmap="${withval}"
-                fi
-
-                if test "x${cross_compiling}" = xyes; then
-                        :
-                elif test "x$selectconfig" = "xfreebsd"; then
-                        LIBS="$LIBS -lkvm"
-                        sh_libkvm="-lkvm"
-                elif test -f "${systemmap}"; then
-
-                        test_kmap_open=no
-
-                        if test -c /dev/kmem; then
-                           AC_MSG_CHECKING([whether /dev/kmem is useable])
-                           dd bs=4 count=16 if=/dev/kmem of=/dev/null >/dev/null 2>&1 
-                           if test $? -eq 0; then
-                              test_kmap_open=yes
-                           fi
-                           AC_MSG_RESULT([${test_kmap_open}])
-                        fi
-
-                        if test x"${test_kmap_open}" = xno; then
-                           # need kernel module
-
-                           if test -f /lib/modules/${kernelversion}/build/include/linux/kernel.h; then
-                              lkm_inc="-I/lib/modules/${kernelversion}/build/include"
-                           else
-                               AC_MSG_WARN([--enable-khide: /lib/modules/${kernelversion}/build/include/linux not found])
-                               AC_MSG_WARN([--enable-khide: You may need to install the kernel-source])
-                               AC_MSG_WARN([--enable-khide: headers for the currently-running kernel.])
-                           fi
-
-                           AC_MSG_CHECKING([for vmlist_lock])
-                           sh_vmlist_lock=`egrep ['[bdBD] vmlist_lock$'] ${systemmap} | awk '{print $1}'` 
-                           if test x"$sh_vmlist_lock" = x; then 
-                               AC_MSG_RESULT(no)
-                           else
-                               sh_vmlist_lock="0x${sh_vmlist_lock}"
-                               AC_MSG_RESULT([${sh_vmlist_lock}])
-                               AC_DEFINE_UNQUOTED(SH_VMLIST_LOCK, ${sh_vmlist_lock}, [The address of the vmlist spinlock])
-                           fi
-
-                           AC_MSG_CHECKING([for vmlist])
-                           sh_vmlist=`egrep ['[bdBD] vmlist$'] ${systemmap} | awk '{print $1}'` 
-                           if test x"$sh_vmlist" = x; then 
-                               AC_MSG_RESULT(no)
-                           else
-                               sh_vmlist="0x${sh_vmlist}"
-                               AC_MSG_RESULT([${sh_vmlist}])
-                               AC_DEFINE_UNQUOTED(SH_VMLIST, ${sh_vmlist}, [The address of the vmlist])
-                           fi
-
-                           sh_lkm="${sh_lkm} samhain_kmem.ko"
-                           sh_insmod_pre="modprobe ${install_name}_kmem"
-
-                        fi
-                else
-                        AC_MSG_ERROR([Option --with-kcheck=systemmap cannot be used, because system map ${systemmap} does not exist.])
-                fi
-        fi
-        ]
-)
-
-AC_SUBST(lkm_inc)
-AC_SUBST(sh_lkm)
-AC_SUBST(sh_insmod_cmd)
-AC_SUBST(sh_insmod_pre)
-
-AC_SUBST(systemmap)
-AC_SUBST(sh_libkvm)
 
 AC_ARG_ENABLE(base,
@@ -2425 +2257 @@
 )
 
+
+
 AC_ARG_WITH(keyid,
         [  --with-keyid=KEYID           specify KeyID (0x...) for GPG/PGP functions [[none]]],
@@ -2896 +2730 @@
         echo "  Configuration file: ${myconffile}"
         echo "        Manual pages: ${mandir}"
-        echo "                Data: ${mydataroot}"
+        echo "      Data directory: ${mydataroot}"
+        echo "       Database file: ${mydatafile}"
         echo "            PID file: ${mylockfile}"
         echo "            Log file: ${mylogfile}"