Skip to content

Commit

Permalink
Restructure dbd driver search path determination
Browse files Browse the repository at this point in the history
Use pkg-config if available (since libdbi 0.9)
Fall back to old hard-coded paths otherwise
  • Loading branch information
gjanssens committed Feb 19, 2014
1 parent 6390beb commit 00e3218
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion configure.ac
Expand Up @@ -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*)
Expand Down

0 comments on commit 00e3218

Please sign in to comment.