From c05773cf84a6e05ed8fe0420023087e3af70e73c Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sat, 21 Sep 2013 16:29:34 +0000 Subject: [PATCH] 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 --- configure.ac | 70 ++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/configure.ac b/configure.ac index f6fa5d8f92..3a1643cf36 100644 --- a/configure.ac +++ b/configure.ac @@ -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 " -# LDFUNC=LoadLibrary -# LDFUNCARGS="" -# LDEXT=dll -# ;; -# Darwin*) -# LDINC="#include " -# LDFUNC=dlopen -# LDFUNCARGS=", RTLD_NOW" -# LDEXT=so -# ;; -# *) -# LDINC="#include " -# 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 " + LDFUNC=LoadLibrary + LDFUNCARGS="" + LDEXT=dll + ;; + Darwin*) + LDINC="#include " + LDFUNC=dlopen + LDFUNCARGS=", RTLD_NOW" + LDEXT=so + ;; + *) + LDINC="#include " + 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"