Merge lp:~mordred/drizzle/require-haildb-not-embedded-innodb into lp:~drizzle-trunk/drizzle/development

[Monty Taylor]

Change the requirement from either libinnodb to libhaildb. Also, tied it to 2.2. No need to support ancient history.

=== renamed file 'm4/pandora_have_libinnodb.m4' => 'm4/pandora_have_libhaildb.m4'
--- m4/pandora_have_libinnodb.m4	2010-09-19 18:20:17 +0000
+++ m4/pandora_have_libhaildb.m4	2010-10-05 06:51:11 +0000
@@ -3,58 +3,41 @@
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([_PANDORA_SEARCH_LIBINNODB],[
+AC_DEFUN([_PANDORA_SEARCH_LIBHAILDB],[
   AC_REQUIRE([AC_LIB_PREFIX])
 
   dnl --------------------------------------------------------------------
-  dnl  Check for libhaildb or libinnodb
+  dnl  Check for libhaildb
   dnl --------------------------------------------------------------------
 
-  AC_ARG_ENABLE([libinnodb],
-    [AS_HELP_STRING([--disable-libinnodb],
-      [Build with libinnodb support @<:@default=on@:>@])],
-    [ac_enable_libinnodb="$enableval"],
-    [ac_enable_libinnodb="yes"])
-
-
-  AS_IF([test "x$ac_enable_libinnodb" = "xyes"],[
+  AC_ARG_ENABLE([libhaildb],
+    [AS_HELP_STRING([--disable-libhaildb],
+      [Build with libhaildb support @<:@default=on@:>@])],
+    [ac_enable_libhaildb="$enableval"],
+    [ac_enable_libhaildb="yes"])
+
+
+  AS_IF([test "x$ac_enable_libhaildb" = "xyes"],[
     AC_LIB_HAVE_LINKFLAGS(haildb,,[
       #include <haildb.h>
     ],[
-      ib_u64_t
-      ib_api_version(void);
+      ib_set_panic_handler(NULL);
     ])
     AS_IF([test "x${ac_cv_libhaildb}" = "xyes"],[
       AC_DEFINE([HAVE_HAILDB_H],[1],[Do we have haildb.h])
-      INNODB_LIBS="${LTLIBHAILDB}"
-      ac_cv_have_innodb=yes
-    ],[
-      AC_LIB_HAVE_LINKFLAGS(innodb,,[
-        #include <embedded_innodb-1.0/innodb.h>
-      ],[
-        ib_u64_t
-        ib_api_version(void);
-      ])
-      AS_IF([test "x${ac_cv_libinnodb}" = "xyes"],[
-        AC_DEFINE([HAVE_INNODB_H],[1],[Do we have innodb.h])
-        INNODB_LIBS="${LTLIBINNODB}"
-        ac_cv_have_innodb=yes
-      ])
-    ])
+      ])
   ],[
     ac_cv_libhaildb="no"
-    ac_cv_libinnodb="no"
   ])
-  AC_SUBST([INNODB_LIBS])
-  AM_CONDITIONAL(HAVE_LIBINNODB, [test "x${ac_cv_have_innodb}" = "xyes"])
-])
-
-AC_DEFUN([PANDORA_HAVE_LIBINNODB],[
-  AC_REQUIRE([_PANDORA_SEARCH_LIBINNODB])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_LIBINNODB],[
-  AC_REQUIRE([PANDORA_HAVE_LIBINNODB])
-  AS_IF([test "x${ac_cv_libinnodb}" = "xno"],
-      AC_MSG_ERROR([libhaildb or libinnodb is required for ${PACKAGE}]))
+  AM_CONDITIONAL(HAVE_LIBHAILDB, [test "x${ac_cv_libhaildb}" = "xyes"])
+])
+
+AC_DEFUN([PANDORA_HAVE_LIBHAILDB],[
+  AC_REQUIRE([_PANDORA_SEARCH_LIBHAILDB])
+])
+
+AC_DEFUN([PANDORA_REQUIRE_LIBHAILDB],[
+  AC_REQUIRE([PANDORA_HAVE_LIBHAILDB])
+  AS_IF([test "x${ac_cv_libhaildb}" = "xno"],
+      AC_MSG_ERROR([libhaildb 2.2.0 or later is required for ${PACKAGE}]))
 ])

=== modified file 'plugin/haildb/plugin.ac'
--- plugin/haildb/plugin.ac	2010-02-08 03:36:14 +0000
+++ plugin/haildb/plugin.ac	2010-10-05 06:51:11 +0000
@@ -1,1 +1,1 @@
-PANDORA_HAVE_LIBINNODB
\ No newline at end of file
+PANDORA_HAVE_LIBHAILDB

=== modified file 'plugin/haildb/plugin.ini'
--- plugin/haildb/plugin.ini	2010-09-30 05:47:49 +0000
+++ plugin/haildb/plugin.ini	2010-10-05 06:51:11 +0000
@@ -4,5 +4,5 @@
 sources=haildb_engine.cc haildb_version_func.cc haildb_datadict_dump_func.cc config_table_function.cc status_table_function.cc datadict_table_message.cc
 headers=haildb_engine.h haildb_version_func.h haildb_datadict_dump_func.h config_table_function.h status_table_function.h
 build_conditional="x${ac_cv_have_innodb}" = "xyes"
-ldflags=${INNODB_LIBS}
+ldflags=${LTLIBHAILDB}
 extra_dist=test-suite-dir