Merge lp:~trond-norbye/pandora-build/innodb into lp:pandora-build

Proposed by Trond Norbye
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trond-norbye/pandora-build/innodb
Merge into: lp:pandora-build
Diff against target: None lines
To merge this branch: bzr merge lp:~trond-norbye/pandora-build/innodb
Reviewer Review Type Date Requested Status
Monty Taylor Pending
Review via email: mp+12149@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Trond Norbye (trond-norbye) wrote :

Added support for embedded innodb. Unfortunately the test includes the version number of in the path for the headerfile, but that's the way they install the header... I guess we should file a RFE for them to install the header without the version number in the path the next time, and fix the test when the new version is released.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'm4/pandora_have_innodb.m4'
--- m4/pandora_have_innodb.m4 1970-01-01 00:00:00 +0000
+++ m4/pandora_have_innodb.m4 2009-09-21 08:23:04 +0000
@@ -0,0 +1,41 @@
1dnl Copyright (C) 2009 Sun Microsystems
2dnl This file is free software; Sun Microsystems
3dnl gives unlimited permission to copy and/or distribute it,
4dnl with or without modifications, as long as this notice is preserved.
5
6AC_DEFUN([_PANDORA_SEARCH_LIBINNODB],[
7 AC_REQUIRE([AC_LIB_PREFIX])
8
9 dnl --------------------------------------------------------------------
10 dnl Check for libinnodb
11 dnl --------------------------------------------------------------------
12
13 AC_ARG_ENABLE([libinnodb],
14 [AS_HELP_STRING([--disable-libinnodb],
15 [Build with libinnodb support @<:@default=on@:>@])],
16 [ac_enable_libinnodb="$enableval"],
17 [ac_enable_libinnodb="yes"])
18
19 AS_IF([test "x$ac_enable_libinnodb" = "xyes"],[
20 AC_LIB_HAVE_LINKFLAGS(innodb,,[
21 #include <embedded_innodb-1.0/innodb.h>
22 ],[
23 ib_u64_t
24 ib_api_version(void);
25 ])
26 ],[
27 ac_cv_libinnodb="no"
28 ])
29
30 AM_CONDITIONAL(HAVE_LIBINNODB, [test "x${ac_cv_libinnodb}" = "xyes"])
31])
32
33AC_DEFUN([PANDORA_HAVE_LIBINNODB],[
34 AC_REQUIRE([_PANDORA_SEARCH_LIBINNODB])
35])
36
37AC_DEFUN([PANDORA_REQUIRE_LIBINNODB],[
38 AC_REQUIRE([PANDORA_HAVE_LIBINNODB])
39 AS_IF([test "x${ac_cv_libinnodb}" = "xno"],
40 AC_MSG_ERROR([libinnodb is required for ${PACKAGE}]))
41])

Subscribers

People subscribed via source and target branches

to all changes: