pandora-build v0.62

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index 0fcaca147b3e279a1907ea0ee5f4a93ec38de50a..0084b43850cde559fe63b9941f54e59ef035e063 100644 (file)
--- 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 (file)
index 0000000..db50aed
--- /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 <embedded_innodb-1.0/innodb.h>
+    ],[
+      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 3b1652e9d40dddb4e1affe7c87047b1247110060..068c676269899d7dbf3af7668d031b99a06606ce 100644 (file)
--- 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 c4f2b2ad546334373831721fd25ec32c97d48828..678b51ea029e2b6dd62a9d12bd420fe37744d298 100644 (file)
--- 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 78af2ba516637098b6c0a40b176cefe6bb56542f..75b00fc35550fe9dc3b1927dc391657e7c866b59 100644 (file)
--- 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 fe91b08bcb7039d32d2b63e2573fcd432830c155..89f12dd6bfbc414443159e3ac63266cb6498b659 100644 (file)
--- 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 8e8c28a239930f93ae795cb961bdc0721109c60f..7fee06a7f9c339880476c9516386f784b7fa7873 100644 (file)
--- 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 26af035dcc27714270c9463b0115b7323b08baae..322271f8ff7d9b4e1bce66d6c803725d6651a2ca 100644 (file)
--- 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 f17c07a7b5b64186640fb3010637c8c13a725fed..5c1fa1cf3b432b2372737b437b5c7c95ad5a8619 100644 (file)
--- 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 4e163fd121da7bd4a9ff0f5bbb44f1b413771609..070b00db786dfd92366c91a0a1669b3082939340 100644 (file)
--- 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 97aa57f8d0df4b3a6b26975e599fd550bce82362..348e7edd82b424d1e57c1755ccbcee4700091159 100644 (file)
--- 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 9b7117e2176081783e7eb0cc4dbb92163b9502b4..4ad67a9b2356ba45f231ee5975e8a7fd6f51616a 100644 (file)
--- 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 cc6dc59435c8fd124c6ab050022de43d9c3e993f..843b201b939f6a39f25fe1546b93d6d42e6a5c1a 100644 (file)
--- 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 63b4263f3396021fd3e94c99bf8011a819dc15e5..2d09e9b1b6dbbc0391d75f1df5ea16f46c25e87c 100644 (file)
--- 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