From 72d1387f30fa00993e55450223e72339cfbb81d9 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Tue, 24 Sep 2013 20:59:13 +0000
Subject: [PATCH] Bug 654196 - "make check" fails when built with --enable-dbi

Change ordering of flags so that picky compilers build the test correctly.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23195 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 2b78423fd1..77cea41a71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -534,6 +534,7 @@ then
   EXTRA_SEARCH_LIBS=""
   AC_CHECK_HEADERS(dbi/dbi.h)
   if test "x$ac_cv_header_dbi_dbi_h" != xno; then
+    save_libs=$LIBS
     AC_ARG_WITH( dbi-dbd-dir,
       [AS_HELP_STRING([--with-dbi-dbd-dir=PATH],[specify location of libdbi drivers @<:@default=${libdir}/dbd@:>@])],
       [[GNC_DBD_DIR="$with_dbi_dbd_dir"
@@ -551,7 +552,7 @@ then
 	 LDINC="#include <dlfcn.h>"
 	 LDFUNCARGS=", RTLD_NOW"
 	 LDEXT=so
-	 export LDFLAGS="$LDFLAGS $lt_cv_dlopen_libs"
+	 export LIBS="$lt_cv_dlopen_libs $LIBS"
 	 ;;
       esac
       export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$EXTRA_SEARCH_LIBS"
@@ -581,6 +582,7 @@ to the configure argument list and run it again.
 
     LIBDBI_LIBS=-ldbi
     _COMPONENTS="$_COMPONENTS dbi"
+    LIBS=$saved_libs
   else
     AC_MSG_ERROR([