r23189 - gnucash/trunk - Revert r23187 "Revert dbi check"

Geert Janssens gjanssens at code.gnucash.org
Sat Sep 21 12:29:36 EDT 2013


Author: gjanssens
Date: 2013-09-21 12:29:34 -0400 (Sat, 21 Sep 2013)
New Revision: 23189
Trac: http://svn.gnucash.org/trac/changeset/23189

Modified:
   gnucash/trunk/configure.ac
Log:
Revert r23187 "Revert dbi check"

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

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2013-09-21 16:13:02 UTC (rev 23188)
+++ gnucash/trunk/configure.ac	2013-09-21 16:29:34 UTC (rev 23189)
@@ -537,41 +537,41 @@
       [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"



More information about the gnucash-changes mailing list