From: Florian Forster <octo@noris.net>
Date: Fri, 31 Oct 2008 10:31:43 +0000 (+0100)
Subject: Merge branch 'ff/oracle'
X-Git-Tag: collectd-4.6.0~171
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=c87da66245197f489bb0e9efffc23538cf07e70b

Merge branch 'ff/oracle'

Conflicts:

	configure.in
---

c87da66245197f489bb0e9efffc23538cf07e70b
diff --cc configure.in
index 9319d5fc,538bcfe2..6eb2cc67
--- a/configure.in
+++ b/configure.in
@@@ -1552,9 -1498,74 +1552,78 @@@ the
  fi
  AM_CONDITIONAL(BUILD_WITH_LIBOPING, test "x$with_liboping" = "xyes")
  AM_CONDITIONAL(BUILD_WITH_OWN_LIBOPING, test "x$with_own_liboping" = "xyes")
 +# }}}
  
++# --with-oracle {{{
+ with_oracle_cppflags=""
+ with_oracle_libs=""
+ AC_ARG_WITH(oracle, [AS_HELP_STRING([--with-oracle@<:@=ORACLE_HOME@:>@], [Path to Oracle.])],
+ [
+ 	if test "x$withval" = "xyes"
+ 	then
+ 		if test "x$ORACLE_HOME" = "x"
+ 		then
+ 			AC_MSG_WARN([Use of the Oracle library has been forced, but the environment variable ORACLE_HOME is not set.])
+ 		fi
+ 		with_oracle="yes"
+ 	else if test "x$withval" = "xno"
+ 	then
+ 		with_oracle="no"
+ 	else
+ 		with_oracle="yes"
+ 		ORACLE_HOME="$withval"
+ 	fi; fi
+ ],
+ [
+ 	if test "x$ORACLE_HOME" = "x"
+ 	then
+ 		with_oracle="no (ORACLE_HOME is not set)"
+ 	else
+ 		with_oracle="yes"
+ 	fi
+ ])
+ if test "x$ORACLE_HOME" != "x"
+ then
+ 	with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public"
+ 
+ 	if test -e "$ORACLE_HOME/lib/ldflags"
+ 	then
+ 		with_oracle_libs=`cat "$ORACLE_HOME/lib/ldflags"`
+ 	fi
+ 	#with_oracle_libs="-L$ORACLE_HOME/lib $with_oracle_libs -lclntsh"
+ 	with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh"
+ fi
+ if test "x$with_oracle" = "xyes"
+ then
+ 	SAVE_CPPFLAGS="$CPPFLAGS"
+ 	CPPFLAGS="$CPPFLAGS $with_oracle_cppflags"
+ 
+ 	AC_CHECK_HEADERS(oci.h, [with_oracle="yes"], [with_oracle="no (oci.h not found)"])
+ 
+ 	CPPFLAGS="$SAVE_CPPFLAGS"
+ fi
+ if test "x$with_oracle" = "xyes"
+ then
+ 	SAVE_CPPFLAGS="$CPPFLAGS"
+ 	SAVE_LDFLAGS="$LDFLAGS"
+ 	CPPFLAGS="$CPPFLAGS $with_oracle_cppflags"
+ 	LDFLAGS="$LDFLAGS $with_oracle_libs"
+ 
+ 	AC_CHECK_FUNC(OCIEnvCreate, [with_oracle="yes"], [with_oracle="no (Symbol 'OCIEnvCreate' not found)"])
+ 
+ 	CPPFLAGS="$SAVE_CPPFLAGS"
+ 	LDFLAGS="$SAVE_LDFLAGS"
+ fi
+ if test "x$with_oracle" = "xyes"
+ then
+ 	BUILD_WITH_ORACLE_CFLAGS="$with_oracle_cppflags"
+ 	BUILD_WITH_ORACLE_LIBS="$with_oracle_libs"
+ 	AC_SUBST(BUILD_WITH_ORACLE_CFLAGS)
+ 	AC_SUBST(BUILD_WITH_ORACLE_LIBS)
+ fi
++# }}}
+ 
 +# --with-libowcapi {{{
  with_libowcapi_cppflags=""
  with_libowcapi_libs="-lowcapi"
  AC_ARG_WITH(libowcapi, [AS_HELP_STRING([--with-libowcapi@<:@=PREFIX@:>@], [Path to libowcapi.])],