Drizzle

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

  1. require-haildb-not-embedded-innodb
  2. Merge into development
Proposed by Monty Taylor
Status: Merged
Approved by: Brian Aker
Approved revision: 1807
Merged at revision: 1817
Proposed branch: lp:~mordred/drizzle/require-haildb-not-embedded-innodb
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 104 lines (+25/-42)
3 files modified
m4/pandora_have_libhaildb.m4 (+23/-40)
plugin/haildb/plugin.ac (+1/-1)
plugin/haildb/plugin.ini (+1/-1)
To merge this branch: bzr merge lp:~mordred/drizzle/require-haildb-not-embedded-innodb
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+37559@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
3dnl gives unlimited permission to copy and/or distribute it,3dnl gives unlimited permission to copy and/or distribute it,
4dnl with or without modifications, as long as this notice is preserved.4dnl with or without modifications, as long as this notice is preserved.
55
6AC_DEFUN([_PANDORA_SEARCH_LIBINNODB],[6AC_DEFUN([_PANDORA_SEARCH_LIBHAILDB],[
7 AC_REQUIRE([AC_LIB_PREFIX])7 AC_REQUIRE([AC_LIB_PREFIX])
88
9 dnl --------------------------------------------------------------------9 dnl --------------------------------------------------------------------
10 dnl Check for libhaildb or libinnodb10 dnl Check for libhaildb
11 dnl --------------------------------------------------------------------11 dnl --------------------------------------------------------------------
1212
13 AC_ARG_ENABLE([libinnodb],13 AC_ARG_ENABLE([libhaildb],
14 [AS_HELP_STRING([--disable-libinnodb],14 [AS_HELP_STRING([--disable-libhaildb],
15 [Build with libinnodb support @<:@default=on@:>@])],15 [Build with libhaildb support @<:@default=on@:>@])],
16 [ac_enable_libinnodb="$enableval"],16 [ac_enable_libhaildb="$enableval"],
17 [ac_enable_libinnodb="yes"])17 [ac_enable_libhaildb="yes"])
1818
1919
20 AS_IF([test "x$ac_enable_libinnodb" = "xyes"],[20 AS_IF([test "x$ac_enable_libhaildb" = "xyes"],[
21 AC_LIB_HAVE_LINKFLAGS(haildb,,[21 AC_LIB_HAVE_LINKFLAGS(haildb,,[
22 #include <haildb.h>22 #include <haildb.h>
23 ],[23 ],[
24 ib_u64_t24 ib_set_panic_handler(NULL);
25 ib_api_version(void);
26 ])25 ])
27 AS_IF([test "x${ac_cv_libhaildb}" = "xyes"],[26 AS_IF([test "x${ac_cv_libhaildb}" = "xyes"],[
28 AC_DEFINE([HAVE_HAILDB_H],[1],[Do we have haildb.h])27 AC_DEFINE([HAVE_HAILDB_H],[1],[Do we have haildb.h])
29 INNODB_LIBS="${LTLIBHAILDB}"28 ])
30 ac_cv_have_innodb=yes
31 ],[
32 AC_LIB_HAVE_LINKFLAGS(innodb,,[
33 #include <embedded_innodb-1.0/innodb.h>
34 ],[
35 ib_u64_t
36 ib_api_version(void);
37 ])
38 AS_IF([test "x${ac_cv_libinnodb}" = "xyes"],[
39 AC_DEFINE([HAVE_INNODB_H],[1],[Do we have innodb.h])
40 INNODB_LIBS="${LTLIBINNODB}"
41 ac_cv_have_innodb=yes
42 ])
43 ])
44 ],[29 ],[
45 ac_cv_libhaildb="no"30 ac_cv_libhaildb="no"
46 ac_cv_libinnodb="no"
47 ])31 ])
48 AC_SUBST([INNODB_LIBS])32 AM_CONDITIONAL(HAVE_LIBHAILDB, [test "x${ac_cv_libhaildb}" = "xyes"])
49 AM_CONDITIONAL(HAVE_LIBINNODB, [test "x${ac_cv_have_innodb}" = "xyes"])33])
50])34
5135AC_DEFUN([PANDORA_HAVE_LIBHAILDB],[
52AC_DEFUN([PANDORA_HAVE_LIBINNODB],[36 AC_REQUIRE([_PANDORA_SEARCH_LIBHAILDB])
53 AC_REQUIRE([_PANDORA_SEARCH_LIBINNODB])37])
54])38
5539AC_DEFUN([PANDORA_REQUIRE_LIBHAILDB],[
56AC_DEFUN([PANDORA_REQUIRE_LIBINNODB],[40 AC_REQUIRE([PANDORA_HAVE_LIBHAILDB])
57 AC_REQUIRE([PANDORA_HAVE_LIBINNODB])41 AS_IF([test "x${ac_cv_libhaildb}" = "xno"],
58 AS_IF([test "x${ac_cv_libinnodb}" = "xno"],42 AC_MSG_ERROR([libhaildb 2.2.0 or later is required for ${PACKAGE}]))
59 AC_MSG_ERROR([libhaildb or libinnodb is required for ${PACKAGE}]))
60])43])
6144
=== 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 @@
1PANDORA_HAVE_LIBINNODB
2\ No newline at end of file1\ No newline at end of file
2PANDORA_HAVE_LIBHAILDB
33
=== 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 @@
4sources=haildb_engine.cc haildb_version_func.cc haildb_datadict_dump_func.cc config_table_function.cc status_table_function.cc datadict_table_message.cc4sources=haildb_engine.cc haildb_version_func.cc haildb_datadict_dump_func.cc config_table_function.cc status_table_function.cc datadict_table_message.cc
5headers=haildb_engine.h haildb_version_func.h haildb_datadict_dump_func.h config_table_function.h status_table_function.h5headers=haildb_engine.h haildb_version_func.h haildb_datadict_dump_func.h config_table_function.h status_table_function.h
6build_conditional="x${ac_cv_have_innodb}" = "xyes"6build_conditional="x${ac_cv_have_innodb}" = "xyes"
7ldflags=${INNODB_LIBS}7ldflags=${LTLIBHAILDB}
8extra_dist=test-suite-dir8extra_dist=test-suite-dir