[evolution-data-server] Correct Berkeley DB (libdb) CFLAGS/LIBS

[Milan Crha <mcrha src gnome org>]

commit e97eafa86a9ac8a49ee554c8a3478fa2a1992fef
Author: Milan Crha <mcrha redhat com>
Date:   Mon Mar 2 12:31:41 2015 +0100

    Correct Berkeley DB (libdb) CFLAGS/LIBS

 configure.ac |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7e7d730..6b24543 100644
--- a/configure.ac
+++ b/configure.ac
@@ -634,18 +634,18 @@ AC_ARG_WITH([libdb],
 
 if test "x$with_libdb" != "xno" ; then
        if test "x$with_libdb" != "xyes" ; then
-               DB_CFLAGS="-I$with_libdb/include"
-               DB_LIBS="-L$with_libdb/lib -ldb"
+               DB_CFLAGS="$CFLAGS -I$with_libdb/include"
+               DB_LIBS="$LIBS -L$with_libdb/lib -ldb"
        else
                if test -z "$DB_CFLAGS" -a -z "$DB_LIBS"; then
-                       DB_CFLAGS=""
-                       DB_LIBS="-ldb"
+                       DB_CFLAGS="$CFLAGS"
+                       DB_LIBS="$LIBS -ldb"
                fi
        fi
 
        AC_MSG_CHECKING([Berkeley DB])
-       save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS
-       save_libs=$LIBS; LIBS="$DB_LIBS"
+       save_cflags=$CFLAGS; CFLAGS="$CFLAGS $DB_CFLAGS"
+       save_libs=$LIBS; LIBS="$LIBS $DB_LIBS"
        AC_LINK_IFELSE([AC_LANG_PROGRAM(
                [[#include <db.h>]],
                [[db_create(NULL, NULL, 0)]])],