Changeset 169 for trunk/configure.ac

Timestamp:

Apr 13, 2008, 9:59:55 PM (17 years ago)

Author:

katerina

Message:

Fixes for tickes #93 to #104 (yes, big commit, bad, bad,...).

File:

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

trunk/configure.ac

@@ -13 +13 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.4.3) 
+AM_INIT_AUTOMAKE(samhain, 2.4.4) 
 AC_CANONICAL_HOST
 
@@ -100 +100 @@
         
         *openbsd*)
+        AC_DEFINE([HOST_IS_OPENBSD], 1, [Define if host OS is OPENBSD])
         selectconfig=freebsd
         AC_MSG_RESULT(none)
@@ -589 +590 @@
 $PS ax >/dev/null 2>&1
 if test $? -eq 0; then
+   case "$host_os" in
+   *openbsd*)
+   one=`$PS akx | wc -l`
+   ;;
+   *)
    one=`$PS ax | wc -l`
+   ;;
+   esac
 else
    one=0
@@ -601 +609 @@
 if test $one -ge $two 
 then
-    PSARG="ax"
+   case "$host_os" in
+   *openbsd*)
+        PSARG="akx"
+        ;;
+   *)
+        PSARG="ax"
+        ;;
+   esac
 else
-    PSARG="-e"
+        PSARG="-e"
 fi
 AC_DEFINE_UNQUOTED([PSARG], _("$PSARG"), [Argument for ps])
@@ -2146 +2161 @@
         [
         if test "x${cross_compiling}" = xyes; then
-                :
+                my_tmp_dir="$withval"
+                AC_DEFINE_UNQUOTED(SH_TMPDIR, _("${my_tmp_dir}") )
         else
                 if test -d "${withval}"; then
@@ -2152 +2168 @@
                         AC_DEFINE_UNQUOTED(SH_TMPDIR, _("${my_tmp_dir}") )
                 else
-                        AC_MSG_ERROR([--with-tmp-dir: tmp directory ${withval} does not exist])
+                        my_tmp_dir="$withval"
+                        AC_DEFINE_UNQUOTED(SH_TMPDIR, _("${my_tmp_dir}") )
+                        AC_MSG_WARN([--with-tmp-dir: tmp directory ${withval} does not exist])
                 fi
         fi