oracle plugin: use CPPFLAGS instead of CFLAGS

diff --git a/configure.ac b/configure.ac
index 6fe250fe0a169f02c73788eab567ee80e431c484..e3df376a89748778117fdc04ef7889d408a0a354 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3365,9 +3365,9 @@ then
 fi
 if test "x$with_oracle" = "xyes"
 then
-       BUILD_WITH_ORACLE_CFLAGS="$with_oracle_cppflags"
+       BUILD_WITH_ORACLE_CPPFLAGS="$with_oracle_cppflags"
        BUILD_WITH_ORACLE_LIBS="$with_oracle_libs"
-       AC_SUBST(BUILD_WITH_ORACLE_CFLAGS)
+       AC_SUBST(BUILD_WITH_ORACLE_CPPFLAGS)
        AC_SUBST(BUILD_WITH_ORACLE_LIBS)
 fi
 # }}}

diff --git a/src/Makefile.am b/src/Makefile.am
index abc560bd4b9dd4b1feedf9086bbf546b4f871ce4..79d7cd4a881cf70723995d9946340549d9cc2dcb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -780,8 +780,7 @@ if BUILD_PLUGIN_ORACLE
 pkglib_LTLIBRARIES += oracle.la
 oracle_la_SOURCES = oracle.c \
        utils_db_query.c utils_db_query.h
-oracle_la_CFLAGS = $(AM_CFLAGS)
-oracle_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_ORACLE_CFLAGS)
+oracle_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_ORACLE_CPPFLAGS)
 oracle_la_LIBADD = $(BUILD_WITH_ORACLE_LIBS)
 oracle_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 endif