diff options
| author | Viktors Tjarve <viktors.tjarve@zabbix.com> | 2016-01-29 10:58:50 +0300 |
|---|---|---|
| committer | Viktors Tjarve <viktors.tjarve@zabbix.com> | 2016-01-29 10:58:50 +0300 |
| commit | cc21c8e9b5c48a1b600b9ebf5fa387d758076444 (patch) | |
| tree | 5d668377455329c95af709ab66c0c3610414333c /configure.ac | |
| parent | c0136fb676073f5bdb8f07acd4d97f80527517bb (diff) | |
| parent | 728f8a7b7c4046a48bf09ab693df6760935326f3 (diff) | |
....I..... [ZBX-4069] fixed LDAP and Oracle DB compilation conflict
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 46d4fdff700..ac86435f1a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1236,12 +1236,14 @@ if test "x$server" = "xyes" || test "x$proxy" = "xyes"; then DB_CPPFLAGS="$IBM_DB2_CPPFLAGS $MYSQL_CFLAGS $ORACLE_CPPFLAGS $POSTGRESQL_CFLAGS $SQLITE3_CPPFLAGS" DB_LDFLAGS="$IBM_DB2_LDFLAGS $MYSQL_LDFLAGS $ORACLE_LDFLAGS $POSTGRESQL_LDFLAGS $SQLITE3_LDFLAGS" DB_LIBS="$IBM_DB2_LIBS $MYSQL_LIBS $ORACLE_LIBS $POSTGRESQL_LIBS $SQLITE3_LIBS" + + AM_CPPFLAGS=$DB_CPPFLAGS AC_SUBST(DB_CPPFLAGS) AC_SUBST(DB_LDFLAGS) AC_SUBST(DB_LIBS) + AC_SUBST(AM_CPPFLAGS) - CFLAGS="${CFLAGS} ${DB_CPPFLAGS}" SERVER_LDFLAGS="${SERVER_LDFLAGS} ${DB_LDFLAGS}" SERVER_LIBS="${SERVER_LIBS} ${DB_LIBS}" |