Changeset 415 for trunk/configure.ac

Timestamp:

Nov 1, 2012, 7:45:54 AM (12 years ago)

Author:

katerina

Message:

Fixes for tickets #314, #315, #316, #317, #318, #319, #320, and #321.

File:

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

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 3.0.6)
+AM_INIT_AUTOMAKE(samhain, 3.0.8)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST
@@ -1425 +1425 @@
 
         elif test "x${withval}" = "xoracle"; then
-          AC_MSG_CHECKING(for oracle in /usr /usr/local ORACLE_HOME)
+
+          AC_MSG_CHECKING(for oracle in ORACLE_HOME /usr/local /usr)
+
           oracle_directory="/usr /usr/local ${ORACLE_HOME}"
           for i in $oracle_directory; do 
-            if test -r $i/rdbms/demo/oci.h; then
-            ORACLE_DIR=$i
-          fi  
-          done
+
+              ff=`find $i -name oci.h 2>/dev/null | tail -1`
+              if test "x$ff" = "x"; then
+                 :
+              else
+                 ORACLE_INC=`dirname $ff`
+              fi
+
+              fg=`find $i -name libclntsh.so 2>/dev/null | tail -1`
+              if test "x$fg" = "x"; then
+                 :
+              else
+                 ORACLE_LIB=`dirname $fg`
+              fi
+
+           done
           
-          if test -z "$ORACLE_DIR"; then
+          if test -z "$ORACLE_INC"; then
+
               tmp=""
               for i in $oracle_directory; do
-                tmp="$tmp $i/rdbms/demo"
+                tmp="$tmp $i"
               done
-              FAIL_MESSAGE("OCI header file (oci.h)", $tmp)
-          else 
-            for i in rdbms/demo rdbms/public network/public; do
-              ORACLE_CPP_FLAGS="$ORACLE_CPP_FLAGS -I$ORACLE_DIR/$i"
-            done
-            ORACLE_LIB_DIR="$ORACLE_DIR/lib"
-            AC_MSG_RESULT(yes)
+              FAIL_MESSAGE("OCI header file (oci.h) please define ORACLE_INC directory where oci.h resides", $tmp)
+
+          elif test -z "$ORACLE_LIB"; then
+
+              tmp=""
+              for i in $oracle_directory; do
+                tmp="$tmp $i"
+              done
+              FAIL_MESSAGE("OCI library file (libclntsh.so) please define ORACLE_LIB directory where libclntsh.so resides", $tmp)
+
+          else
+
+            ORACLE_CPP_FLAGS="-I$ORACLE_INC"
+            ORACLE_LIB_DIR="$ORACLE_LIB"
+
+            AC_MSG_RESULT([$ORACLE_INC $ORACLE_LIB])
 
             CPPFLAGS="${CPPFLAGS} ${ORACLE_CPP_FLAGS}"
 
             ORACLE_LIBS="-lclntsh"
+
+            if test -r $ORACLE_LIB_DIR/libnnz11.so; then
+              ORACLE_LIBS="${ORACLE_LIBS} -lnnz11"
+            fi
             if test -r $ORACLE_LIB_DIR/libwtc9.so; then
               ORACLE_LIBS="${ORACLE_LIBS} -lwtc9"