Changeset 162 for trunk/configure.ac

Timestamp:

Feb 1, 2008, 1:03:47 AM (17 years ago)

Author:

katerina

Message:

Fix for ticket #89, #90, and #91 (locking,compile failure).

File:

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

trunk/configure.ac

@@ -13 +13 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.4.2) 
+AM_INIT_AUTOMAKE(samhain, 2.4.3) 
 AC_CANONICAL_HOST
 
@@ -207 +207 @@
         sys/select.h sys/socket.h netinet/in.h \
         regex.h glob.h \
-        linux/ext2_fs.h linux/fs.h ext2fs/ext2_fs.h \
+        linux/ext2_fs.h linux/fs.h ext2fs/ext2_fs.h asm/segment.h \
         elf.h linux/elf.h \
         paths.h arpa/nameser.h arpa/nameser_compat.h \
@@ -1751 +1751 @@
            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
-                        echo "--enable-khide: symbol modlist_lock not found in ${khidemap}"
+                        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
-                        echo "--enable-khide: symbol module_mutex not found in ${khidemap}"
+                        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
@@ -1792 +1795 @@
                 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
@@ -1797 +1802 @@
            fi
            if test x"${sh_is_vanilla_kernel}" = xno; then
-                echo "This is not a 2.4 vanilla kernel"
+                AC_MSG_RESULT(no)
            else
+                AC_MSG_RESULT(yes)
                 AC_DEFINE(SH_VANILLA_KERNEL)
            fi
+
         fi
         ]