From b36773d850fdf14ef7da0aa2977f4bcfd233bafd Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 1 Oct 2009 16:48:09 -0700 Subject: [PATCH] pandora-build v0.62 --- m4/pandora_canonical.m4 | 2 +- m4/pandora_have_innodb.m4 | 41 +++++++++++++++++++++++++++++++++++++ m4/pandora_have_protobuf.m4 | 2 +- m4/pandora_platform.m4 | 2 +- m4/pandora_pthread.m4 | 2 +- m4/pandora_swig.m4 | 2 +- m4/pandora_use_pipe.m4 | 2 +- m4/pandora_with_lua.m4 | 2 +- m4/pandora_with_perl.m4 | 2 +- m4/pandora_with_php.m4 | 2 +- m4/pandora_with_python.m4 | 2 +- m4/pandora_with_python3.m4 | 2 +- m4/pandora_with_r.m4 | 2 +- m4/pandora_with_ruby.m4 | 2 +- 14 files changed, 54 insertions(+), 13 deletions(-) create mode 100644 m4/pandora_have_innodb.m4 diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4 index 0fcaca14..0084b438 100644 --- a/m4/pandora_canonical.m4 +++ b/m4/pandora_canonical.m4 @@ -4,7 +4,7 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Which version of the canonical setup we're using -AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.61]) +AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.62]) AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[ dnl Force dependency tracking on for Sun Studio builds diff --git a/m4/pandora_have_innodb.m4 b/m4/pandora_have_innodb.m4 new file mode 100644 index 00000000..db50aedd --- /dev/null +++ b/m4/pandora_have_innodb.m4 @@ -0,0 +1,41 @@ +dnl Copyright (C) 2009 Sun Microsystems +dnl This file is free software; Sun Microsystems +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_REQUIRE([AC_LIB_PREFIX]) + + dnl -------------------------------------------------------------------- + dnl Check for libinnodb + 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_LIB_HAVE_LINKFLAGS(innodb,,[ + #include + ],[ + ib_u64_t + ib_api_version(void); + ]) + ],[ + ac_cv_libinnodb="no" + ]) + + AM_CONDITIONAL(HAVE_LIBINNODB, [test "x${ac_cv_libinnodb}" = "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([libinnodb is required for ${PACKAGE}])) +]) diff --git a/m4/pandora_have_protobuf.m4 b/m4/pandora_have_protobuf.m4 index 3b1652e9..068c6762 100644 --- a/m4/pandora_have_protobuf.m4 +++ b/m4/pandora_have_protobuf.m4 @@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; the Free Software Foundation +dnl This file is free software; Sun Microsystems dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl diff --git a/m4/pandora_platform.m4 b/m4/pandora_platform.m4 index c4f2b2ad..678b51ea 100644 --- a/m4/pandora_platform.m4 +++ b/m4/pandora_platform.m4 @@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; the Free Software Foundation +dnl This file is free software; Sun Microsystems dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl diff --git a/m4/pandora_pthread.m4 b/m4/pandora_pthread.m4 index 78af2ba5..75b00fc3 100644 --- a/m4/pandora_pthread.m4 +++ b/m4/pandora_pthread.m4 @@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; the Free Software Foundation +dnl This file is free software; Sun Microsystems dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl diff --git a/m4/pandora_swig.m4 b/m4/pandora_swig.m4 index fe91b08b..89f12dd6 100644 --- a/m4/pandora_swig.m4 +++ b/m4/pandora_swig.m4 @@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; the Free Software Foundation +dnl This file is free software; Sun Microsystem dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl diff --git a/m4/pandora_use_pipe.m4 b/m4/pandora_use_pipe.m4 index 8e8c28a2..7fee06a7 100644 --- a/m4/pandora_use_pipe.m4 +++ b/m4/pandora_use_pipe.m4 @@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; the Free Software Foundation +dnl This file is free software; Sun Microsystem dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl diff --git a/m4/pandora_with_lua.m4 b/m4/pandora_with_lua.m4 index 26af035d..322271f8 100644 --- a/m4/pandora_with_lua.m4 +++ b/m4/pandora_with_lua.m4 @@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; the Free Software Foundation +dnl This file is free software; Sun Microsystems dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl diff --git a/m4/pandora_with_perl.m4 b/m4/pandora_with_perl.m4 index f17c07a7..5c1fa1cf 100644 --- a/m4/pandora_with_perl.m4 +++ b/m4/pandora_with_perl.m4 @@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; the Free Software Foundation +dnl This file is free software; Sun Microsystems dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl diff --git a/m4/pandora_with_php.m4 b/m4/pandora_with_php.m4 index 4e163fd1..070b00db 100644 --- a/m4/pandora_with_php.m4 +++ b/m4/pandora_with_php.m4 @@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; the Free Software Foundation +dnl This file is free software; Sun Microsystems dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl diff --git a/m4/pandora_with_python.m4 b/m4/pandora_with_python.m4 index 97aa57f8..348e7edd 100644 --- a/m4/pandora_with_python.m4 +++ b/m4/pandora_with_python.m4 @@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; the Free Software Foundation +dnl This file is free software; Sun Microsystems dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl diff --git a/m4/pandora_with_python3.m4 b/m4/pandora_with_python3.m4 index 9b7117e2..4ad67a9b 100644 --- a/m4/pandora_with_python3.m4 +++ b/m4/pandora_with_python3.m4 @@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; the Free Software Foundation +dnl This file is free software; Sun Microsystems dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl diff --git a/m4/pandora_with_r.m4 b/m4/pandora_with_r.m4 index cc6dc594..843b201b 100644 --- a/m4/pandora_with_r.m4 +++ b/m4/pandora_with_r.m4 @@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; the Free Software Foundation +dnl This file is free software; Sun Microsystems dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl diff --git a/m4/pandora_with_ruby.m4 b/m4/pandora_with_ruby.m4 index 63b4263f..2d09e9b1 100644 --- a/m4/pandora_with_ruby.m4 +++ b/m4/pandora_with_ruby.m4 @@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; the Free Software Foundation +dnl This file is free software; Sun Microsystems dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -- 2.30.2