gnucash master: Restructure dbd driver search path determination

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/00e32182 (commit)
	from  https://github.com/Gnucash/gnucash/commit/6390beb5 (commit)



commit 00e3218252075568071d8efd1d9b463f3722e4dd
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Wed Feb 19 13:03:34 2014 +0100

    Restructure dbd driver search path determination
    
    Use pkg-config if available (since libdbi 0.9)
    Fall back to old hard-coded paths otherwise

diff --git a/configure.ac b/configure.ac
index a900d17..3c777d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -604,7 +604,14 @@ then
       [[GNC_DBD_DIR="$with_dbi_dbd_dir"
        EXTRA_SEARCH_LIBS=$GNC_DBD_DIR]],
       [[GNC_DBD_DIR=""
-       EXTRA_SEARCH_LIBS="/usr/lib/dbd:/usr/lib64/dbd:${libdir}/dbd:$(pkg-config --variable=libdir dbi)/dbd"]]
+        # pkg-config is new in libdbi 0.9. Use it if avaiable
+        # Otherwise fall back to our previous hard coded values
+        pkg-config --exists dbi
+        if test $? -eq 0; then
+          EXTRA_SEARCH_LIBS="$(pkg-config --variable=libdir dbi)/dbd"
+        else
+          EXTRA_SEARCH_LIBS="/usr/lib/dbd:/usr/lib64/dbd:${libdir}/dbd"
+        fi]]
        )
     case $host_os in
        win32*|mingw*)



Summary of changes:
 configure.ac | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)