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

diff --git a/.bzrignore b/.bzrignore
index 6c51079f387082ad688555fee37bb9b583341c7b..dc1898a6b765711c72159b16ac1655d604029731 100644 (file)
--- 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 bcf804278fcf5dae92cd5a4031ed1747b94ae56a..c0d388387a20da9d2d5758cb63f500f57b69990f 100755 (executable)
--- 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 ec104b7d98b08b9a448437e1e12a9acfb5069ca6..48957d415d2a76965d6e08a5fa16b8a99ba04813 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.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 c4df08dc6efb69afbf8a4384347b78d32aed9359..53b5ebfd59eabbd2b5050746ee22a9d3ccdd979d 100644 (file)
--- 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
+])