r23195 - gnucash/trunk - Bug 654196 - "make check" fails when built with --enable-dbi

[John Ralls]

Author: jralls
Date: 2013-09-24 16:59:13 -0400 (Tue, 24 Sep 2013)
New Revision: 23195
Trac: http://svn.gnucash.org/trac/changeset/23195

Modified:
   gnucash/trunk/configure.ac
Log:
Bug 654196 - "make check" fails when built with --enable-dbi

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

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2013-09-24 20:32:22 UTC (rev 23194)
+++ gnucash/trunk/configure.ac	2013-09-24 20:59:13 UTC (rev 23195)
@@ -534,6 +534,7 @@
   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 @@
 	 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 @@
 
     LIBDBI_LIBS=-ldbi
     _COMPONENTS="$_COMPONENTS dbi"
+    LIBS=$saved_libs
   else
     AC_MSG_ERROR([