Revert r23187 "Revert dbi check"

This commit was only intended on my machine locally to be able
to continue to work.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23189 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens
2013-09-21 16:29:34 +00:00
parent 1366f6b6bf
commit c05773cf84

View File

@@ -537,41 +537,41 @@ then
[AS_HELP_STRING([--with-dbi-dbd-dir=PATH],[specify location of libdbi drivers @<:@default=${libdir}/dbd@:>@])],
GNC_DBD_DIR="$with_dbi_dbd_dir",
GNC_DBD_DIR="")
# case $host_os in
# win32*|mingw*)
# LDINC="#include <windows.h>"
# LDFUNC=LoadLibrary
# LDFUNCARGS=""
# LDEXT=dll
# ;;
# Darwin*)
# LDINC="#include <dlfcn.h>"
# LDFUNC=dlopen
# LDFUNCARGS=", RTLD_NOW"
# LDEXT=so
# ;;
# *)
# LDINC="#include <dlfcn.h>"
# LDFUNC=dlopen
# LDFUNCARGS=", RTLD_NOW"
# LDEXT=so
# export LDFLAGS="$LDFLAGS -ldl"
# ;;
# esac
# export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$GNC_DBD_DIR"
# AC_MSG_CHECKING([Looking for at least one supported DBD module])
# AC_RUN_IFELSE([AC_LANG_PROGRAM([$LDINC],
# [[if (!$LDFUNC("libdbdsqlite3.$LDEXT"$LDFUNCARGS)) return -1;
# ]])],AC_MSG_RESULT([SQLite3]),
# AC_RUN_IFELSE([AC_LANG_PROGRAM([$LDINC],
# [[if (!$LDFUNC("libdbdmysql.$LDEXT"$LDFUNCARGS)) return -1;
# ]])],AC_MSG_RESULT([MySql]),
# AC_RUN_IFELSE([AC_LANG_PROGRAM([$LDINC],
# [[if (!$LDFUNC("libdbdpgsql.$LDEXT"$LDFUNCARGS)) return -1;
# ]])],AC_MSG_RESULT([Postgresql]),
# AC_MSG_FAILURE([[
#Unable to find any of the supported dbd modules (libdbdsqlite3, libdbdmysql, or libdbdpgsql) needed to actually use the SQL backend. Please install one or more of them to proceed.
# ]]))))
case $host_os in
win32*|mingw*)
LDINC="#include <windows.h>"
LDFUNC=LoadLibrary
LDFUNCARGS=""
LDEXT=dll
;;
Darwin*)
LDINC="#include <dlfcn.h>"
LDFUNC=dlopen
LDFUNCARGS=", RTLD_NOW"
LDEXT=so
;;
*)
LDINC="#include <dlfcn.h>"
LDFUNC=dlopen
LDFUNCARGS=", RTLD_NOW"
LDEXT=so
export LDFLAGS="$LDFLAGS -ldl"
;;
esac
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$GNC_DBD_DIR"
AC_MSG_CHECKING([Looking for at least one supported DBD module])
AC_RUN_IFELSE([AC_LANG_PROGRAM([$LDINC],
[[if (!$LDFUNC("libdbdsqlite3.$LDEXT"$LDFUNCARGS)) return -1;
]])],AC_MSG_RESULT([SQLite3]),
AC_RUN_IFELSE([AC_LANG_PROGRAM([$LDINC],
[[if (!$LDFUNC("libdbdmysql.$LDEXT"$LDFUNCARGS)) return -1;
]])],AC_MSG_RESULT([MySql]),
AC_RUN_IFELSE([AC_LANG_PROGRAM([$LDINC],
[[if (!$LDFUNC("libdbdpgsql.$LDEXT"$LDFUNCARGS)) return -1;
]])],AC_MSG_RESULT([Postgresql]),
AC_MSG_FAILURE([[
Unable to find any of the supported dbd modules (libdbdsqlite3, libdbdmysql, or libdbdpgsql) needed to actually use the SQL backend. Please install one or more of them to proceed.
]]))))
LIBDBI_LIBS=-ldbi
_COMPONENTS="$_COMPONENTS dbi"