[icinga-checkins] icinga.org: icinga-core/master: add --with-ocilib-lib/inc to configure, if --enable-oracle set

git at icinga.org git at icinga.org
Mon Oct 19 18:51:27 CEST 2009


Module: icinga-core
Branch: master
Commit: a77bb3e71958712a0ca2e770d877c2ef579857f7
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=a77bb3e71958712a0ca2e770d877c2ef579857f7

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Oct 19 03:59:27 2009 +0200

add --with-ocilib-lib/inc to configure, if --enable-oracle set
e.g.
./configure --prefix=/opt/icinga --enable-idoutils --enable-oracle \
--with-ocilib-lib=/opt/ocilib/lib \
--with-ocilib-inc=/opt/ocilib/include

---

 configure    |   18 ++++++++++++++++++
 configure.in |   10 +++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 0fffe7d..736714c 100755
--- a/configure
+++ b/configure
@@ -1361,6 +1361,8 @@ Optional Packages:
                           sets URL for public html
   --with-dbi-lib=DIR      sets location of the dbi library
   --with-dbi-inc=DIR      sets location of the dbi include files,
+  --with-ocilib-lib=DIR   sets location of the ocilib library
+  --with-ocilib-inc=DIR   sets location of the ocilib include files,
   --with-perlcache        turns on cacheing of internally compiled Perl
                           scripts
   --with-ssl=DIR          sets location of the SSL installation
@@ -7808,6 +7810,22 @@ fi
 		OCILIB_LIB="/usr/local/lib"
 
 
+# Check whether --with-ocilib-lib was given.
+if test "${with_ocilib_lib+set}" = set; then
+  withval=$with_ocilib_lib;
+	                OCILIB_LIB="${withval}"
+
+fi
+
+
+# Check whether --with-ocilib-inc was given.
+if test "${with_ocilib_inc+set}" = set; then
+  withval=$with_ocilib_inc;
+	                OCILIB_INC="${withval}"
+
+fi
+
+
 		CFLAGS="$CFLAGS -I$OCILIB_INC -DOCI_IMPORT_RUNTIME -DOCI_CHARSET_ANSI"
 		LDFLAGS="$LDFLAGS -L$OCILIB_LIB"
 
diff --git a/configure.in b/configure.in
index f4f668b..3769514 100644
--- a/configure.in
+++ b/configure.in
@@ -690,9 +690,13 @@ if test x$USE_IDOUTILS = xyes; then
 		OCILIB_INC="/usr/local/include"
 		OCILIB_LIB="/usr/local/lib"
 
-		dnl create ido2db_runtime for rc.ido2db.in
-		dnl ido2db_runtime="$OCILIB_LIB"
-		dnl AC_SUBST(ido2db_runtime)
+	        dnl Optional ocilib library and include paths
+	        AC_ARG_WITH(ocilib-lib,AC_HELP_STRING([--with-ocilib-lib=DIR],[sets location of the ocilib library]),[
+	                OCILIB_LIB="${withval}"
+	                ])
+	        AC_ARG_WITH(ocilib-inc,AC_HELP_STRING([--with-ocilib-inc=DIR],[sets location of the ocilib include files,]),[
+	                OCILIB_INC="${withval}"
+        	        ])
 
 		CFLAGS="$CFLAGS -I$OCILIB_INC -DOCI_IMPORT_RUNTIME -DOCI_CHARSET_ANSI"
 		LDFLAGS="$LDFLAGS -L$OCILIB_LIB"





More information about the icinga-checkins mailing list