From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 10 Aug 2009 21:09:44 +0000 (-0700)
Subject: pandora-build v0.46 - fixed a plugin system problem when it's not in use.
X-Git-Tag: 0.34~16^2~9
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=38c4b902f9971cf0e95add1e24a7cad86b5d38dd;p=m6w6%2Flibmemcached

pandora-build v0.46 - fixed a plugin system problem when it's not in use.
---

diff --git a/.bzrignore b/.bzrignore
index 6c51079f..dc1898a6 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -56,3 +56,4 @@ libmemcached-0.30-1.src.rpm
 libmemcached-0.30-1.x86_64.rpm
 libmemcached-0.31-1.src.rpm
 libmemcached-0.31-1.x86_64.rpm
+config/plugin.ac
diff --git a/config/autorun.sh b/config/autorun.sh
index bcf80427..c0d38838 100755
--- a/config/autorun.sh
+++ b/config/autorun.sh
@@ -41,6 +41,12 @@ then
   . config/pre_hook.sh
 fi
 
+# We need to some file here for the m4_sinclude, even if it's just empty
+if ! test -f config/plugin.ac
+then
+  touch config/plugin.ac
+fi
+
 # Try to detect the supported binaries if the user didn't
 # override that by pushing the environment variable
 if test x$LIBTOOLIZE = x; then
diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index ec104b7d..48957d41 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.45])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.46])
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   dnl Force dependency tracking on for Sun Studio builds
diff --git a/m4/pandora_plugins.m4 b/m4/pandora_plugins.m4
index c4df08dc..53b5ebfd 100644
--- a/m4/pandora_plugins.m4
+++ b/m4/pandora_plugins.m4
@@ -31,4 +31,4 @@ AC_DEFUN([PANDORA_PLUGINS],[
 
 AC_DEFUN([PANDORA_ADD_PLUGIN_DEP_LIB],[
   PANDORA_PLUGIN_DEP_LIBS="${PANDORA_PLUGIN_DEP_LIBS} $*"
-])
\ No newline at end of file
+])