Add build support for a minimum distribution using prebuilt dependencies from Ubuntu 9.10.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951656 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 380 insertions, 344 deletions

diff --git a/sca-cpp/trunk/configure.ac b/sca-cpp/trunk/configure.ac
index 805c08c993..79e6bbdac5 100644
--- a/sca-cpp/trunk/configure.ac
+++ b/sca-cpp/trunk/configure.ac
@@ -48,130 +48,10 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 
-# Check for running on Darwin.
-AC_MSG_CHECKING([if running on Darwin])
-UNAME=`uname -s`
-if test "${UNAME}" = "Darwin"; then
-  AC_DEFINE([IS_DARWIN], 1, [running on Darwin])
-  AC_MSG_RESULT(yes)
-  AC_SUBST([libsuffix],[".dylib"])
-  AM_CONDITIONAL([DARWIN], true)
-else
-  AC_MSG_RESULT(no)
-  AC_SUBST([libsuffix],[".so"])
-  AM_CONDITIONAL([DARWIN], false)
-fi
-
-# Configure path to CURL.
-AC_MSG_CHECKING([for curl])
-AC_ARG_WITH([curl], [AC_HELP_STRING([--with-curl=PATH], [path to installed curl [default=/usr]])], [
-  CURL_PREFIX="${withval}"
-  LIBCURL_INCLUDE="${withval}/include"
-  LIBCURL_LIB="${withval}/lib"
-  AC_MSG_RESULT("${withval}")
-], [
-  CURL_PREFIX="/usr"
-  LIBCURL_INCLUDE="/usr/include"
-  LIBCURL_LIB="/usr/lib"
-  AC_MSG_RESULT(/usr)
-])
-AC_SUBST(CURL_PREFIX)
-AC_SUBST(LIBCURL_INCLUDE)
-AC_SUBST(LIBCURL_LIB)
-
-# Configure path to libxml2 includes and lib.
-AC_MSG_CHECKING([for libxml2])
-AC_ARG_WITH([libxml2], [AC_HELP_STRING([--with-libxml2=PATH], [path to installed libxml2 [default=/usr]])], [
-  LIBXML2_INCLUDE="${withval}/include/libxml2"
-  LIBXML2_LIB="${withval}/lib"
-  AC_MSG_RESULT("${withval}")
-], [
-  LIBXML2_INCLUDE="/usr/include/libxml2"
-  LIBXML2_LIB="/usr/lib"
-  AC_MSG_RESULT(/usr)
-])
-AC_SUBST(LIBXML2_INCLUDE)
-AC_SUBST(LIBXML2_LIB)
-
-# Configure path to libmozjs includes and lib.
-AC_MSG_CHECKING([for js-include])
-xulrunner=`ls /usr/include | grep "xulrunner" | tail -1`
-if test "$xulrunner" = ""; then
-  xulrunner="xulrunner-1.9.1.8"
-fi
-AC_ARG_WITH([js-include], [AC_HELP_STRING([--with-js-include=PATH], [path to installed SpiderMonkey include dir
-             [default=/usr/include/$xulrunner/unstable]])], [
-  JS_INCLUDE="${withval}"
-  AC_MSG_RESULT("${withval}")
-], [
-  JS_INCLUDE="/usr/include/$xulrunner/unstable"
-  AC_MSG_RESULT(/usr/include/$xulrunner/unstable)
-])
-AC_MSG_CHECKING([for js-lib])
-AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH], [path to installed SpiderMonkey lib dir [default=/usr/lib/$xulrunner]])], [
-  JS_LIB="${withval}"
-  AC_MSG_RESULT("${withval}")
-], [
-  JS_LIB="/usr/lib/$xulrunner"
-  AC_MSG_RESULT(/usr/lib/$xulrunner)
-])
-AC_SUBST(JS_INCLUDE)
-AC_SUBST(JS_LIB)
-
-# Configure path to Apache APR and HTTPD includes and libs.
-AC_MSG_CHECKING([for apr])
-AC_ARG_WITH([apr], [AC_HELP_STRING([--with-apr=PATH], [path to installed Apache APR [default=/usr/local/apache2]])], [
-  APR_INCLUDE="${withval}/include"
-  APR_LIB="${withval}/lib"
-  AC_MSG_RESULT("${withval}")
-], [
-  APR_INCLUDE="/usr/local/apache2/include"
-  APR_LIB="/usr/local/apache2/lib"
-  AC_MSG_RESULT(/usr/local/apache2/lib)
-])
-AC_SUBST(APR_INCLUDE)
-AC_SUBST(APR_LIB)
-
-AC_MSG_CHECKING([for httpd])
-AC_ARG_WITH([httpd], [AC_HELP_STRING([--with-httpd=PATH], [path to installed Apache HTTPD [default=/usr/local/apache2]])], [
-  HTTPD_PREFIX="${withval}"
-  HTTPD_INCLUDE="${withval}/include"
-  AC_MSG_RESULT("${withval}")
-], [
-  HTTPD_PREFIX="/usr/local/apache2"
-  HTTPD_INCLUDE="/usr/local/apache2/include"
-  AC_MSG_RESULT(/usr/local/apache2/lib)
-])
-AC_SUBST(HTTPD_PREFIX)
-AC_SUBST(HTTPD_INCLUDE)
-
-# Configure path to memcached.
-AC_MSG_CHECKING([for memcached])
-AC_ARG_WITH([memcached], [AC_HELP_STRING([--with-memcached=PATH], [path to installed memcached [default=/usr]])], [
-  MEMCACHED_PREFIX="${withval}"
-  AC_MSG_RESULT("${withval}")
-], [
-  MEMCACHED_PREFIX="/usr"
-  AC_MSG_RESULT(/usr)
-])
-AC_SUBST(MEMCACHED_PREFIX)
-
-# Configure path to tinycdb.
-AC_MSG_CHECKING([for tinycdb])
-AC_ARG_WITH([tinycdb], [AC_HELP_STRING([--with-tinycdb=PATH], [path to installed tinycdb [default=/usr]])], [
-  TINYCDB_PREFIX="${withval}"
-  TINYCDB_INCLUDE="${withval}/include"
-  TINYCDB_LIB="${withval}/lib"
-  AC_MSG_RESULT("${withval}")
-], [
-  TINYCDB_PREFIX="/usr"
-  TINYCDB_INCLUDE="/usr/include"
-  TINYCDB_LIB="/usr/lib"
-  AC_MSG_RESULT(/usr)
-])
-AC_SUBST(TINYCDB_PREFIX)
-AC_SUBST(TINYCDB_INCLUDE)
-AC_SUBST(TINYCDB_LIB)
+# Initialize default GCC C++ and LD options.
+cxxflags=""
+ldflags="${LDFLAGS}"
+defaultlibs="${LIBS}"
 
 # Configure TUSCANY_SCACPP path variable.
 TUSCANY_SCACPP=`echo "${TUSCANY_SCACPP}"`
@@ -180,29 +60,6 @@ if test "${TUSCANY_SCACPP}" = ""; then
   AC_SUBST([TUSCANY_SCACPP], ["${pwd}"])
 fi
 
-# Initialize default GCC C++ and LD options.
-cxxflags=""
-ldflags="${LDFLAGS}"
-defaultlibs="${LIBS}"
-
-# Configure default includes.
-cxxflags="${cxxflags} ${INCLUDES} -I. -I${TUSCANY_SCACPP}/kernel -I${APR_INCLUDE} -I${LIBXML2_INCLUDE} -I${JS_INCLUDE} -I${LIBCURL_INCLUDE}"
-
-# Check for libraries required by all modules and add them to LD options.
-AC_MSG_NOTICE([checking for required libraries])
-LIBS="-L${APR_LIB} ${defaultlibs}"
-AC_CHECK_LIB([apr-1], [apr_pool_initialize], [AC_MSG_NOTICE([found])], [AC_MSG_ERROR([couldn't find a suitable libapr-1, use --with-apr=PATH])])
-ldflags="${ldflags} -ldl -L${APR_LIB} -R${APR_LIB} -lapr-1 -laprutil-1"
-
-# Check for libraries only required by some modules and add their search path to LD options.  
-LIBS="-L${LIBCURL_LIB} ${defaultlibs}"
-AC_CHECK_LIB([curl], [curl_global_init], [], [AC_MSG_ERROR([couldn't find a suitable libcurl, use --with-libcurl=PATH])])
-LIBS="-L${JS_LIB} ${defaultlibs}"
-AC_CHECK_LIB([mozjs], [JS_NewContext], [], [AC_MSG_ERROR([couldn't find a suitable libmozjs, use --with-js-lib=PATH])])
-LIBS="-L${LIBXML2_LIB} ${defaultlibs}"
-AC_CHECK_LIB([xml2], [xmlInitParser], [], [AC_MSG_ERROR([couldn't find a suitable libxml2, use --with-libxml2=PATH])])
-ldflags="${ldflags} -L${LIBCURL_LIB} -R${LIBCURL_LIB} -L${JS_LIB} -R${JS_LIB} -L${LIBXML2_LIB} -R${LIBXML2_LIB}"
-
 # Check for required header files.
 AC_MSG_NOTICE([checking for header files])
 AC_HEADER_DIRENT
@@ -220,6 +77,20 @@ AC_TYPE_SIZE_T
 AC_MSG_NOTICE([checking for library functions])
 AC_CHECK_FUNCS([gettimeofday select])
 
+# Check for running on Darwin.
+AC_MSG_CHECKING([if running on Darwin])
+UNAME=`uname -s`
+if test "${UNAME}" = "Darwin"; then
+  AC_DEFINE([IS_DARWIN], 1, [running on Darwin])
+  AC_MSG_RESULT(yes)
+  AC_SUBST([libsuffix],[".dylib"])
+  AM_CONDITIONAL([DARWIN], true)
+else
+  AC_MSG_RESULT(no)
+  AC_SUBST([libsuffix],[".so"])
+  AM_CONDITIONAL([DARWIN], false)
+fi
+
 # Enable debugging and compile-time warnings.
 AC_MSG_CHECKING([whether to compile with debugging and compile-time warnings])
 AC_ARG_ENABLE(maintainer-mode, [AS_HELP_STRING([--enable-maintainer-mode], [compile with debugging and compile-time warnings [default=no]])],
@@ -317,26 +188,159 @@ else
   AM_CONDITIONAL([WANT_DOXYGEN], false)
 fi
 
-# Configure path to Python 2.6 includes and lib.
-AC_MSG_CHECKING([for python])
-AC_ARG_WITH([python], [AC_HELP_STRING([--with-python=PATH], [path to installed Python 2.6 [default=/usr]])], [
-  PYTHON_PREFIX="${withval}"
-  PYTHON_INCLUDE="${withval}/include"
-  PYTHON_LIB="${withval}/lib"
+# Configure path to CURL.
+AC_MSG_CHECKING([for curl])
+AC_ARG_WITH([curl], [AC_HELP_STRING([--with-curl=PATH], [path to installed curl [default=/usr]])], [
+  CURL_PREFIX="${withval}"
+  LIBCURL_INCLUDE="${withval}/include"
+  LIBCURL_LIB="${withval}/lib"
+  AC_MSG_RESULT("${withval}")
+], [
+  CURL_PREFIX="/usr"
+  LIBCURL_INCLUDE="/usr/include"
+  LIBCURL_LIB="/usr/lib"
+  AC_MSG_RESULT(/usr)
+])
+AC_SUBST(CURL_PREFIX)
+AC_SUBST(LIBCURL_INCLUDE)
+AC_SUBST(LIBCURL_LIB)
+LIBS="-L${LIBCURL_LIB} ${defaultlibs}"
+AC_CHECK_LIB([curl], [curl_global_init], [], [AC_MSG_ERROR([couldn't find a suitable libcurl, use --with-libcurl=PATH])])
+
+# Configure path to libxml2 includes and lib.
+AC_MSG_CHECKING([for libxml2])
+AC_ARG_WITH([libxml2], [AC_HELP_STRING([--with-libxml2=PATH], [path to installed libxml2 [default=/usr]])], [
+  LIBXML2_INCLUDE="${withval}/include/libxml2"
+  LIBXML2_LIB="${withval}/lib"
+  AC_MSG_RESULT("${withval}")
+], [
+  LIBXML2_INCLUDE="/usr/include/libxml2"
+  LIBXML2_LIB="/usr/lib"
+  AC_MSG_RESULT(/usr)
+])
+AC_SUBST(LIBXML2_INCLUDE)
+AC_SUBST(LIBXML2_LIB)
+LIBS="-L${LIBXML2_LIB} ${defaultlibs}"
+AC_CHECK_LIB([xml2], [xmlInitParser], [], [AC_MSG_ERROR([couldn't find a suitable libxml2, use --with-libxml2=PATH])])
+
+# Configure path to libmozjs includes and lib.
+AC_MSG_CHECKING([for js-include])
+xulrunner=`ls /usr/include | grep "xulrunner" | tail -1`
+if test "$xulrunner" = ""; then
+  xulrunner="xulrunner-1.9.1.8"
+fi
+AC_ARG_WITH([js-include], [AC_HELP_STRING([--with-js-include=PATH], [path to installed SpiderMonkey include dir
+             [default=/usr/include/$xulrunner/unstable]])], [
+  JS_INCLUDE="${withval}"
+  AC_MSG_RESULT("${withval}")
+], [
+  JS_INCLUDE="/usr/include/$xulrunner/unstable"
+  AC_MSG_RESULT(/usr/include/$xulrunner/unstable)
+])
+AC_MSG_CHECKING([for js-lib])
+AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH], [path to installed SpiderMonkey lib dir [default=/usr/lib/$xulrunner]])], [
+  JS_LIB="${withval}"
+  AC_MSG_RESULT("${withval}")
+], [
+  JS_LIB="/usr/lib/$xulrunner"
+  AC_MSG_RESULT(/usr/lib/$xulrunner)
+])
+AC_SUBST(JS_INCLUDE)
+AC_SUBST(JS_LIB)
+LIBS="-L${JS_LIB} ${defaultlibs}"
+AC_CHECK_LIB([mozjs], [JS_NewContext], [], [AC_MSG_ERROR([couldn't find a suitable libmozjs, use --with-js-lib=PATH])])
+
+# Configure path to Apache APR and HTTPD includes and libs.
+AC_MSG_CHECKING([for apr])
+AC_ARG_WITH([apr], [AC_HELP_STRING([--with-apr=PATH], [path to installed Apache APR [default=/usr/apache2]])], [
+  APR_INCLUDE="${withval}/include"
+  APR_LIB="${withval}/lib"
   AC_MSG_RESULT("${withval}")
 ], [
-  PYTHON_PREFIX="/usr"
-  PYTHON_INCLUDE="/usr/include"
-  PYTHON_LIB="/usr/lib"
+  APR_INCLUDE="/usr/include/apr-1.0"
+  APR_LIB="/usr/lib"
   AC_MSG_RESULT(/usr)
 ])
-AC_SUBST(PYTHON_PREFIX)
-AC_SUBST(PYTHON_INCLUDE)
-AC_SUBST(PYTHON_LIB)
+AC_SUBST(APR_INCLUDE)
+AC_SUBST(APR_LIB)
+LIBS="-L${APR_LIB} ${defaultlibs}"
+AC_CHECK_LIB([apr-1], [apr_pool_initialize], [], [AC_MSG_ERROR([couldn't find a suitable libapr-1, use --with-apr=PATH])])
+
+AC_MSG_CHECKING([for httpd])
+AC_ARG_WITH([httpd], [AC_HELP_STRING([--with-httpd=PATH], [path to installed Apache HTTPD [default=/usr]])], [
+  HTTPD_PREFIX="${withval}"
+  HTTPD_APACHECTL_PREFIX="${withval}/bin/apachectl"
+  HTTPD_MODULES_PREFIX="${withval}"
+  HTTPD_INCLUDE="${withval}/include"
+  AC_MSG_RESULT("${withval}")
+], [
+  HTTPD_PREFIX="/usr"
+  HTTPD_APACHECTL_PREFIX="/usr/sbin/apache2ctl"
+  HTTPD_MODULES_PREFIX="/usr/lib/apache2"
+  HTTPD_INCLUDE="/usr/include/apache2"
+  AC_MSG_RESULT(/usr)
+])
+AC_SUBST(HTTPD_PREFIX)
+AC_SUBST(HTTPD_APACHECTL_PREFIX)
+AC_SUBST(HTTPD_MODULES_PREFIX)
+AC_SUBST(HTTPD_INCLUDE)
+AC_MSG_CHECKING([for ${APACHECTL_PREFIX}])
+if test -x "${HTTPD_APACHECTL_PREFIX}"; then
+    AC_MSG_RESULT(found)
+else
+    AC_MSG_ERROR([couldn't find apachectl, use --with-httpd=PATH])
+fi
+AC_MSG_CHECKING([for ${HTTPD_PREFIX}/bin/htpasswd])
+if test -x "${HTTPD_PREFIX}/bin/htpasswd"; then
+    AC_MSG_RESULT(found)
+else
+    AC_MSG_ERROR([couldn't find htpasswd, use --with-httpd=PATH])
+fi
+
+# Configure path to memcached.
+AC_MSG_CHECKING([for memcached])
+AC_ARG_WITH([memcached], [AC_HELP_STRING([--with-memcached=PATH], [path to installed memcached [default=/usr]])], [
+  MEMCACHED_PREFIX="${withval}"
+  AC_MSG_RESULT("${withval}")
+], [
+  MEMCACHED_PREFIX="/usr"
+  AC_MSG_RESULT(/usr)
+])
+AC_SUBST(MEMCACHED_PREFIX)
+AC_MSG_CHECKING([for ${MEMCACHED_PREFIX}/bin/memcached])
+if test -x "${MEMCACHED_PREFIX}/bin/memcached"; then
+    AC_MSG_RESULT(found)
+else
+    AC_MSG_ERROR([couldn't find memcached, use --with-memcached=PATH])
+fi
+
+# Configure path to tinycdb.
+AC_MSG_CHECKING([for tinycdb])
+AC_ARG_WITH([tinycdb], [AC_HELP_STRING([--with-tinycdb=PATH], [path to installed tinycdb [default=/usr]])], [
+  TINYCDB_PREFIX="${withval}"
+  TINYCDB_INCLUDE="${withval}/include"
+  TINYCDB_LIB="${withval}/lib"
+  AC_MSG_RESULT("${withval}")
+], [
+  TINYCDB_PREFIX="/usr"
+  TINYCDB_INCLUDE="/usr/include"
+  TINYCDB_LIB="/usr/lib"
+  AC_MSG_RESULT(/usr)
+])
+AC_SUBST(TINYCDB_PREFIX)
+AC_SUBST(TINYCDB_INCLUDE)
+AC_SUBST(TINYCDB_LIB)
+LIBS="-L${TINYCDB_LIB} ${default_LIBS}"
+AC_CHECK_LIB([cdb], [cdb_make_start], [], [AC_MSG_ERROR([couldn't find a suitable libcdb, use --with-tinycdb=PATH])])
+
+# Configure default includes and ldflags
+cxxflags="${cxxflags} ${INCLUDES} -I. -I${TUSCANY_SCACPP}/kernel -I${APR_INCLUDE} -I${HTTPD_INCLUDE} -I${LIBXML2_INCLUDE} -I${JS_INCLUDE} -I${LIBCURL_INCLUDE}"
+ldflags="${ldflags} -ldl -L${APR_LIB} -R${APR_LIB} -lapr-1 -laprutil-1"
+ldflags="${ldflags} -L${LIBCURL_LIB} -R${LIBCURL_LIB} -L${JS_LIB} -R${JS_LIB} -L${LIBXML2_LIB} -R${LIBXML2_LIB}"
 
 # Enable Python 2.6 support.
 AC_MSG_CHECKING([whether to enable Python support])
-AC_ARG_ENABLE(python, [AS_HELP_STRING([--enable-python], [enable Python support [default=no]])],
+AC_ARG_ENABLE(python, [AS_HELP_STRING([--enable-python], [enable Python support [default=yes]])],
 [ case "${enableval}" in
   no)
     AC_MSG_RESULT(no)
@@ -346,36 +350,38 @@ AC_ARG_ENABLE(python, [AS_HELP_STRING([--enable-python], [enable Python support
     want_python=true
     ;;
   esac ],
-[ AC_MSG_RESULT(no)])
+[
+  AC_MSG_RESULT(yes)
+  want_python=true
+])
 if test "${want_python}" = "true"; then
+
+  # Configure path to Python 2.6 includes and lib.
+  AC_MSG_CHECKING([for python])
+  AC_ARG_WITH([python], [AC_HELP_STRING([--with-python=PATH], [path to installed Python 2.6 [default=/usr]])], [
+    PYTHON_PREFIX="${withval}"
+    PYTHON_INCLUDE="${withval}/include"
+    PYTHON_LIB="${withval}/lib"
+    AC_MSG_RESULT("${withval}")
+  ], [
+    PYTHON_PREFIX="/usr"
+    PYTHON_INCLUDE="/usr/include"
+    PYTHON_LIB="/usr/lib"
+    AC_MSG_RESULT(/usr)
+  ])
+  AC_SUBST(PYTHON_PREFIX)
+  AC_SUBST(PYTHON_INCLUDE)
+  AC_SUBST(PYTHON_LIB)
   LIBS="-L${PYTHON_LIB} ${default_LIBS}"
   AC_CHECK_LIB([python2.6], [Py_Initialize], [], [AC_MSG_ERROR([couldn't find a suitable libpython2.6, use --with-python=PATH])])
+
   AM_CONDITIONAL([WANT_PYTHON], true)
   AC_DEFINE([WANT_PYTHON], 1, [enable Python support])
+
 else
   AM_CONDITIONAL([WANT_PYTHON], false)
 fi
 
-# Configure path to Java includes and lib.
-AC_MSG_CHECKING([for java])
-AC_ARG_WITH([java], [AC_HELP_STRING([--with-java=PATH], [path to installed Java [default=/usr/lib/jvm/default-java]])], [
-  JAVA_PREFIX="${withval}"
-  JAVA_INCLUDE="${withval}/include"
-  JAVAC="${withval}/bin/javac"
-  JAR="${withval}/bin/jar" 
-  AC_MSG_RESULT("${withval}")
-], [
-  JAVA_PREFIX="/usr/lib/jvm/default-java"
-  JAVA_INCLUDE="/usr/lib/jvm/default-java/include"
-  JAVAC="/usr/lib/jvm/default-java/bin/javac"
-  JAR="/usr/lib/jvm/default-java/bin/jar" 
-  AC_MSG_RESULT(/usr/lib/jvm/default-java)
-])
-AC_SUBST(JAVA_PREFIX)
-AC_SUBST(JAVA_INCLUDE)
-AC_SUBST(JAVAC)
-AC_SUBST(JAR)
-
 # Enable Java support.
 AC_MSG_CHECKING([whether to enable Java support])
 AC_ARG_ENABLE(java, [AS_HELP_STRING([--enable-java], [enable Java support [default=no]])],
@@ -390,6 +396,27 @@ AC_ARG_ENABLE(java, [AS_HELP_STRING([--enable-java], [enable Java support [defau
   esac ],
 [ AC_MSG_RESULT(no)])
 if test "${want_java}" = "true"; then
+
+  # Configure path to Java includes and lib.
+  AC_MSG_CHECKING([for java])
+  AC_ARG_WITH([java], [AC_HELP_STRING([--with-java=PATH], [path to installed Java [default=/usr/lib/jvm/default-java]])], [
+    JAVA_PREFIX="${withval}"
+    JAVA_INCLUDE="${withval}/include"
+    JAVAC="${withval}/bin/javac"
+    JAR="${withval}/bin/jar" 
+    AC_MSG_RESULT("${withval}")
+  ], [
+    JAVA_PREFIX="/usr/lib/jvm/default-java"
+    JAVA_INCLUDE="/usr/lib/jvm/default-java/include"
+    JAVAC="/usr/lib/jvm/default-java/bin/javac"
+    JAR="/usr/lib/jvm/default-java/bin/jar" 
+    AC_MSG_RESULT(/usr/lib/jvm/default-java)
+  ])
+  AC_SUBST(JAVA_PREFIX)
+  AC_SUBST(JAVA_INCLUDE)
+  AC_SUBST(JAVAC)
+  AC_SUBST(JAR)
+
   # Detect most common Java VMs
   if test -f "${JAVA_PREFIX}/jre/lib/i386/libjava.so"; then
     if test -f "${JAVA_PREFIX}/jre/lib/i386/server/libjvm.so"; then
@@ -448,17 +475,6 @@ else
 fi
 AC_SUBST(JAVA_LDFLAGS)
 
-# Configure path to Google AppEngine SDK.
-AC_MSG_CHECKING([for gae])
-AC_ARG_WITH([gae], [AC_HELP_STRING([--with-gae=PATH], [path to installed Google AppEngine 1.3.2 [default=$HOME/google_appengine]])], [
-  GAE_PREFIX="${withval}"
-  AC_MSG_RESULT("${withval}")
-], [
-  GAE_PREFIX="$HOME/google_appengine"
-  AC_MSG_RESULT($HOME/google_appengine)
-])
-AC_SUBST(GAE_PREFIX)
-
 # Enable support for Google AppEngine.
 AC_MSG_CHECKING([whether to enable Google AppEngine support])
 AC_ARG_ENABLE(gae, [AS_HELP_STRING([--enable-gae], [enable Google AppEngine support [default=no]])],
@@ -473,99 +489,97 @@ AC_ARG_ENABLE(gae, [AS_HELP_STRING([--enable-gae], [enable Google AppEngine supp
   esac ],
 [ AC_MSG_RESULT(no)])
 if test "${want_gae}" = "true"; then
+
+  # Configure path to Google AppEngine SDK.
+  AC_MSG_CHECKING([for gae])
+  AC_ARG_WITH([gae], [AC_HELP_STRING([--with-gae=PATH], [path to installed Google AppEngine 1.3.2 [default=${HOME}/google_appengine]])], [
+    GAE_PREFIX="${withval}"
+    AC_MSG_RESULT("${withval}")
+  ], [
+    GAE_PREFIX="${HOME}/google_appengine"
+    AC_MSG_RESULT(${HOME}/google_appengine)
+  ])
+  AC_SUBST(GAE_PREFIX)
+
   AM_CONDITIONAL([WANT_GAE], true)
   AC_DEFINE([WANT_GAE], 1, [enable Google AppEngine support])
 else
   AM_CONDITIONAL([WANT_GAE], false)
 fi
 
-# Configure path to Apache Libcloud.
-AC_MSG_CHECKING([for libcloud])
-AC_ARG_WITH([libcloud], [AC_HELP_STRING([--with-libcloud=PATH], [path to installed Apache Libcloud [default=/usr/local]])], [
-  LIBCLOUD_LIB="${withval}/lib/python"
-  AC_MSG_RESULT("${withval}")
-], [
-  LIBCLOUD_LIB="/usr/local/lib/python2.6/site-packages"
-  AC_MSG_RESULT(/usr/local)
-])
-AC_SUBST(LIBCLOUD_LIB)
-
-# Configure path to Apache Axis2C includes and lib.
-AC_MSG_CHECKING([for axis2c])
-AC_ARG_WITH([axis2c], [AC_HELP_STRING([--with-axis2c=PATH], [path to installed Apache Axis2C [default=/usr/local/axis2c]])], [
-  AXIS2C_PREFIX="${withval}"
-  AXIS2C_INCLUDE="${withval}/include/axis2-1.6.0"
-  AXIS2C_LIB="${withval}/lib"
-  AC_MSG_RESULT("${withval}")
-], [
-  AXIS2C_PREFIX="/usr/local/axis2c"
-  AXIS2C_INCLUDE="/usr/local/axis2c/include/axis2-1.6.0"
-  AXIS2C_LIB="/usr/local/axis2c/lib"
-  AC_MSG_RESULT(/usr/local/axis2c)
-])
-AC_SUBST(AXIS2C_PREFIX)
-AC_SUBST(AXIS2C_INCLUDE)
-AC_SUBST(AXIS2C_LIB)
-
-# Enable Web service component.
-AC_MSG_CHECKING([whether to enable the Web service component])
-AC_ARG_ENABLE(webservice, [AS_HELP_STRING([--enable-webservice], [enable Web service component [default=no]])],
+# Enable support for Libcloud.
+AC_MSG_CHECKING([whether to enable libcloud support])
+AC_ARG_ENABLE(libcloud, [AS_HELP_STRING([--enable-libcloud], [enable libcloud support [default=no]])],
 [ case "${enableval}" in
   no)
     AC_MSG_RESULT(no)
     ;;
   *)
     AC_MSG_RESULT(yes)
-    want_webservice=true
+    want_libcloud=true
     ;;
   esac ],
 [ AC_MSG_RESULT(no)])
-if test "${want_webservice}" = "true"; then
-  LIBS="-L${AXIS2C_LIB} ${default_LIBS}"
-  AC_CHECK_LIB([axis2_engine], [axis2_svc_client_create], [], [AC_MSG_ERROR([couldn't find a suitable libaxis2_engine, use --with-axis2c=PATH])])
-  AM_CONDITIONAL([WANT_WEBSERVICE], true)
-  AC_DEFINE([WANT_WEBSERVICE], 1, [enable Web service component])
+if test "${want_libcloud}" = "true"; then
+
+  # Configure path to Apache Libcloud.
+  AC_MSG_CHECKING([for libcloud])
+  AC_ARG_WITH([libcloud], [AC_HELP_STRING([--with-libcloud=PATH], [path to installed Apache libcloud [default=/usr/local]])], [
+    LIBCLOUD_LIB="${withval}/lib/python"
+    AC_MSG_RESULT("${withval}")
+  ], [
+    LIBCLOUD_LIB="/usr/local/lib/python2.6/site-packages"
+    AC_MSG_RESULT(/usr/local)
+  ])
+  AC_SUBST(LIBCLOUD_LIB)
+
+  AM_CONDITIONAL([WANT_LIBCLOUD], true)
+  AC_DEFINE([WANT_LIBCLOUD], 1, [enable libcloud support])
 else
-  AM_CONDITIONAL([WANT_WEBSERVICE], false)
+  AM_CONDITIONAL([WANT_LIBCLOUD], false)
 fi
 
-# Enable NoSQL database component.
-AC_MSG_CHECKING([whether to enable the NoSQL database component])
-AC_ARG_ENABLE(nosqldb, [AS_HELP_STRING([--enable-nosqldb], [enable NoSQL database component [default=no]])],
+# Enable Web service component.
+AC_MSG_CHECKING([whether to enable the Web service component])
+AC_ARG_ENABLE(webservice, [AS_HELP_STRING([--enable-webservice], [enable Web service component [default=no]])],
 [ case "${enableval}" in
   no)
     AC_MSG_RESULT(no)
     ;;
   *)
     AC_MSG_RESULT(yes)
-    want_nosqldb=true
+    want_webservice=true
     ;;
   esac ],
 [ AC_MSG_RESULT(no)])
-if test "${want_nosqldb}" = "true"; then
-  AM_CONDITIONAL([WANT_NOSQLDB], true)
-  AC_DEFINE([WANT_NOSQLDB], 1, [enable NoSQL database component])
+if test "${want_webservice}" = "true"; then
+
+  # Configure path to Apache Axis2C includes and lib.
+  AC_MSG_CHECKING([for axis2c])
+  AC_ARG_WITH([axis2c], [AC_HELP_STRING([--with-axis2c=PATH], [path to installed Apache Axis2C [default=/usr/local/axis2c]])], [
+    AXIS2C_PREFIX="${withval}"
+    AXIS2C_INCLUDE="${withval}/include/axis2-1.6.0"
+    AXIS2C_LIB="${withval}/lib"
+    AC_MSG_RESULT("${withval}")
+  ], [
+    AXIS2C_PREFIX="/usr/local/axis2c"
+    AXIS2C_INCLUDE="/usr/local/axis2c/include/axis2-1.6.0"
+    AXIS2C_LIB="/usr/local/axis2c/lib"
+    AC_MSG_RESULT(/usr/local/axis2c)
+  ])
+  AC_SUBST(AXIS2C_PREFIX)
+  AC_SUBST(AXIS2C_INCLUDE)
+  AC_SUBST(AXIS2C_LIB)
+  LIBS="-L${AXIS2C_LIB} ${default_LIBS}"
+  AC_CHECK_LIB([axis2_engine], [axis2_svc_client_create], [], [AC_MSG_ERROR([couldn't find a suitable libaxis2_engine, use --with-axis2c=PATH])])
+
+  AM_CONDITIONAL([WANT_WEBSERVICE], true)
+  AC_DEFINE([WANT_WEBSERVICE], 1, [enable Web service component])
+
 else
-  AM_CONDITIONAL([WANT_NOSQLDB], false)
+  AM_CONDITIONAL([WANT_WEBSERVICE], false)
 fi
 
-# Configure path to PostgreSQL.
-AC_MSG_CHECKING([for pgsql])
-AC_ARG_WITH([pgsql], [AC_HELP_STRING([--with-pgsql=PATH], [path to installed PostgreSQL [default=/usr/local/pgsql]])], [
-  PGSQL_PREFIX="${withval}"
-  PGSQL_INCLUDE="${withval}/include"
-  PGSQL_LIB="${withval}/lib"
-  AC_MSG_RESULT("${withval}")
-], [
-  PGSQL_PREFIX="/usr/local/pgsql"
-  PGSQL_INCLUDE="/usr/local/pgsql/include"
-  PGSQL_LIB="/usr/local/pgsql/lib"
-  AC_MSG_RESULT(/usr/local)
-])
-AC_SUBST(PGSQL_PREFIX)
-AC_SUBST(PGSQL_INCLUDE)
-AC_SUBST(PGSQL_LIB)
-
 # Enable SQL Database component.
 AC_MSG_CHECKING([whether to enable the SQL Database component])
 AC_ARG_ENABLE(sqldb, [AS_HELP_STRING([--enable-sqldb], [enable SQL Database component [default=no]])],
@@ -580,29 +594,30 @@ AC_ARG_ENABLE(sqldb, [AS_HELP_STRING([--enable-sqldb], [enable SQL Database comp
   esac ],
 [ AC_MSG_RESULT(no)])
 if test "${want_sqldb}" = "true"; then
+
+  # Configure path to PostgreSQL.
+  AC_MSG_CHECKING([for pgsql])
+  AC_ARG_WITH([pgsql], [AC_HELP_STRING([--with-pgsql=PATH], [path to installed PostgreSQL [default=/usr/local/pgsql]])], [
+    PGSQL_PREFIX="${withval}"
+    PGSQL_INCLUDE="${withval}/include"
+    PGSQL_LIB="${withval}/lib"
+    AC_MSG_RESULT("${withval}")
+  ], [
+    PGSQL_PREFIX="/usr/local/pgsql"
+    PGSQL_INCLUDE="/usr/local/pgsql/include"
+    PGSQL_LIB="/usr/local/pgsql/lib"
+    AC_MSG_RESULT(/usr/local)
+  ])
+  AC_SUBST(PGSQL_PREFIX)
+  AC_SUBST(PGSQL_INCLUDE)
+  AC_SUBST(PGSQL_LIB)
+
   AM_CONDITIONAL([WANT_SQLDB], true)
   AC_DEFINE([WANT_SQLDB], 1, [enable SQL Database component])
 else
   AM_CONDITIONAL([WANT_SQLDB], false)
 fi
 
-# Configure path to Apache Qpid/C++.
-AC_MSG_CHECKING([for qpidc])
-AC_ARG_WITH([qpidc], [AC_HELP_STRING([--with-qpidc=PATH], [path to installed Apache Qpid/C++ [default=/usr/local]])], [
-  QPIDC_PREFIX="${withval}"
-  QPIDC_INCLUDE="${withval}/include"
-  QPIDC_LIB="${withval}/lib"
-  AC_MSG_RESULT("${withval}")
-], [
-  QPIDC_PREFIX="/usr/local"
-  QPIDC_INCLUDE="/usr/local/include"
-  QPIDC_LIB="/usr/local/lib"
-  AC_MSG_RESULT(/usr/local)
-])
-AC_SUBST(QPIDC_PREFIX)
-AC_SUBST(QPIDC_INCLUDE)
-AC_SUBST(QPIDC_LIB)
-
 # Enable Queue component.
 AC_MSG_CHECKING([whether to enable the Queue component])
 AC_ARG_ENABLE(queue, [AS_HELP_STRING([--enable-queue], [enable Queue component [default=no]])],
@@ -617,42 +632,36 @@ AC_ARG_ENABLE(queue, [AS_HELP_STRING([--enable-queue], [enable Queue component [
   esac ],
 [ AC_MSG_RESULT(no)])
 if test "${want_queue}" = "true"; then
+
+  # Configure path to Apache Qpid/C++.
+  AC_MSG_CHECKING([for qpidc])
+  AC_ARG_WITH([qpidc], [AC_HELP_STRING([--with-qpidc=PATH], [path to installed Apache Qpid/C++ [default=/usr/local]])], [
+    QPIDC_PREFIX="${withval}"
+    QPIDC_INCLUDE="${withval}/include"
+    QPIDC_LIB="${withval}/lib"
+    AC_MSG_RESULT("${withval}")
+  ], [
+    QPIDC_PREFIX="/usr/local"
+    QPIDC_INCLUDE="/usr/local/include"
+    QPIDC_LIB="/usr/local/lib"
+    AC_MSG_RESULT(/usr/local)
+  ])
+  AC_SUBST(QPIDC_PREFIX)
+  AC_SUBST(QPIDC_INCLUDE)
+  AC_SUBST(QPIDC_LIB)
+
   if test "${want_threads}" != "true"; then
     AC_MSG_ERROR([--enable-queue requires multi-threading, use --enable-threads])
   fi
   LIBS="-L${QPIDC_LIB} ${default_LIBS}"
   AC_CHECK_LIB([qpidclient], [_init], [], [AC_MSG_ERROR([couldn't find a suitable libqpidclient, use --with-qpidc=PATH])])
+
   AM_CONDITIONAL([WANT_QUEUE], true)
   AC_DEFINE([WANT_QUEUE], 1, [enable Queue component])
 else
   AM_CONDITIONAL([WANT_QUEUE], false)
 fi
 
-# Configure path to Libstrophe includes and lib.
-AC_MSG_CHECKING([for libstrophe])
-AC_ARG_WITH([libstrophe], [AC_HELP_STRING([--with-libstrophe=PATH], [path to libstrophe [default=${HOME}/libstrophe-bin]])], [
-  LIBSTROPHE_INCLUDE="${withval}/include"
-  LIBSTROPHE_LIB="${withval}/lib"
-  AC_MSG_RESULT("${withval}")
-], [
-  LIBSTROPHE_INCLUDE="${HOME}/libstrophe-bin/include"
-  LIBSTROPHE_LIB="${HOME}/libstrophe-bin/lib"
-  AC_MSG_RESULT(${HOME}/libstrophe-bin)
-])
-AC_SUBST(LIBSTROPHE_INCLUDE)
-AC_SUBST(LIBSTROPHE_LIB)
-
-# Configure path to Vysper
-AC_MSG_CHECKING([for vysper])
-AC_ARG_WITH([vysper], [AC_HELP_STRING([--with-vysper=PATH], [path to Apache Vysper [default=${HOME}/vysper-1.0.0]])], [
-  VYSPER_PREFIX="${withval}"
-  AC_MSG_RESULT("${withval}")
-], [
-  VYSPER_PREFIX="${HOME}/vysper-1.0.0"
-  AC_MSG_RESULT(${HOME}/vysper-1.0.0)
-])
-AC_SUBST(VYSPER_PREFIX)
-
 # Enable Chat component.
 AC_MSG_CHECKING([whether to enable the Chat component])
 AC_ARG_ENABLE(chat, [AS_HELP_STRING([--enable-chat], [enable Chat component [default=no]])],
@@ -667,69 +676,51 @@ AC_ARG_ENABLE(chat, [AS_HELP_STRING([--enable-chat], [enable Chat component [def
   esac ],
 [ AC_MSG_RESULT(no)])
 if test "${want_chat}" = "true"; then
+
+  # Configure path to Libstrophe includes and lib.
+  AC_MSG_CHECKING([for libstrophe])
+  AC_ARG_WITH([libstrophe], [AC_HELP_STRING([--with-libstrophe=PATH], [path to libstrophe [default=${HOME}/libstrophe-bin]])], [
+    LIBSTROPHE_INCLUDE="${withval}/include"
+    LIBSTROPHE_LIB="${withval}/lib"
+    AC_MSG_RESULT("${withval}")
+  ], [
+    LIBSTROPHE_INCLUDE="${HOME}/libstrophe-bin/include"
+    LIBSTROPHE_LIB="${HOME}/libstrophe-bin/lib"
+    AC_MSG_RESULT(${HOME}/libstrophe-bin)
+  ])
+  AC_SUBST(LIBSTROPHE_INCLUDE)
+  AC_SUBST(LIBSTROPHE_LIB)
   if test "${want_threads}" != "true"; then
     AC_MSG_ERROR([--enable-chat requires multi-threading, use --enable-threads])
   fi
   LIBS="-L${LIBSTROPHE_LIB} ${default_LIBS}"
   AC_CHECK_LIB([strophe], [xmpp_initialize], [], [AC_MSG_ERROR([couldn't find a suitable libstrophe, use --with-libstrophe=PATH])], [-lssl -lresolv])
-  AM_CONDITIONAL([WANT_CHAT], true)
-  AC_DEFINE([WANT_CHAT], 1, [enable Chat component])
-
-  # Check for Vysper
+  
+  # Configure path to Vysper
+  AC_MSG_CHECKING([for vysper])
+  AC_ARG_WITH([vysper], [AC_HELP_STRING([--with-vysper=PATH], [path to Apache Vysper [default=${HOME}/vysper-1.0.0]])], [
+    VYSPER_PREFIX="${withval}"
+    AC_MSG_RESULT("${withval}")
+  ], [
+    VYSPER_PREFIX="${HOME}/vysper-1.0.0"
+    AC_MSG_RESULT(${HOME}/vysper-1.0.0)
+  ])
+  AC_SUBST(VYSPER_PREFIX)
   AC_CHECK_FILE([${VYSPER_PREFIX}/lib/vysper-core-0.5.jar], [want_vysper=true], [])
   if test "${want_vysper}" = "true"; then
     AM_CONDITIONAL([WANT_VYSPER], true)
   else
     AM_CONDITIONAL([WANT_VYSPER], false)
   fi
+
+  AM_CONDITIONAL([WANT_CHAT], true)
+  AC_DEFINE([WANT_CHAT], 1, [enable Chat component])
+
 else
   AM_CONDITIONAL([WANT_CHAT], false)
   AM_CONDITIONAL([WANT_VYSPER], false)
 fi
 
-# Configure path to Apache Thrift (and Facebook fb303).
-AC_MSG_CHECKING([for thrift])
-AC_ARG_WITH([thrift], [AC_HELP_STRING([--with-thrift=PATH], [path to installed Apache Thrift [default=/usr/local]])], [
-  THRIFT_PREFIX="${withval}"
-  THRIFT_INCLUDE="${withval}/include/thrift"
-  THRIFT_LIB="${withval}/lib"
-  FB303_PREFIX="${withval}/contrib/fb303"
-  FB303_INCLUDE="${withval}/contrib/fb303/include/thrift"
-  FB303_LIB="${withval}/contrib/fb303/lib"
-  AC_MSG_RESULT("${withval}")
-], [
-  THRIFT_PREFIX="/usr/local"
-  THRIFT_INCLUDE="/usr/local/include"
-  THRIFT_LIB="/usr/local/lib"
-  FB303_PREFIX="/usr/local"
-  FB303_INCLUDE="/usr/local/include"
-  FB303_LIB="/usr/local/lib"
-  AC_MSG_RESULT(/usr/local)
-])
-AC_SUBST(THRIFT_PREFIX)
-AC_SUBST(THRIFT_INCLUDE)
-AC_SUBST(THRIFT_LIB)
-AC_SUBST(FB303_PREFIX)
-AC_SUBST(FB303_INCLUDE)
-AC_SUBST(FB303_LIB)
-
-# Configure path to Facebook Scribe.
-AC_MSG_CHECKING([for scribe])
-AC_ARG_WITH([scribe], [AC_HELP_STRING([--with-scribe=PATH], [path to installed Facebook Scribe [default=/usr/local]])], [
-  SCRIBE_PREFIX="${withval}"
-  SCRIBE_INCLUDE="${withval}/include"
-  SCRIBE_LIB="${withval}/lib"
-  AC_MSG_RESULT("${withval}")
-], [
-  SCRIBE_PREFIX="/usr/local"
-  SCRIBE_INCLUDE="/usr/local/include"
-  SCRIBE_LIB="/usr/local/lib"
-  AC_MSG_RESULT(/usr/local)
-])
-AC_SUBST(SCRIBE_PREFIX)
-AC_SUBST(SCRIBE_INCLUDE)
-AC_SUBST(SCRIBE_LIB)
-
 # Enable Log component.
 AC_MSG_CHECKING([whether to enable the Log component])
 AC_ARG_ENABLE(log, [AS_HELP_STRING([--enable-log], [enable Log component [default=no]])],
@@ -744,10 +735,55 @@ AC_ARG_ENABLE(log, [AS_HELP_STRING([--enable-log], [enable Log component [defaul
   esac ],
 [ AC_MSG_RESULT(no)])
 if test "${want_log}" = "true"; then
+
+  # Configure path to Apache Thrift (and Facebook fb303).
+  AC_MSG_CHECKING([for thrift])
+  AC_ARG_WITH([thrift], [AC_HELP_STRING([--with-thrift=PATH], [path to installed Apache Thrift [default=/usr/local]])], [
+    THRIFT_PREFIX="${withval}"
+    THRIFT_INCLUDE="${withval}/include/thrift"
+    THRIFT_LIB="${withval}/lib"
+    FB303_PREFIX="${withval}/contrib/fb303"
+    FB303_INCLUDE="${withval}/contrib/fb303/include/thrift"
+    FB303_LIB="${withval}/contrib/fb303/lib"
+    AC_MSG_RESULT("${withval}")
+  ], [
+    THRIFT_PREFIX="/usr/local"
+    THRIFT_INCLUDE="/usr/local/include"
+    THRIFT_LIB="/usr/local/lib"
+    FB303_PREFIX="/usr/local"
+    FB303_INCLUDE="/usr/local/include"
+    FB303_LIB="/usr/local/lib"
+    AC_MSG_RESULT(/usr/local)
+  ])
+  AC_SUBST(THRIFT_PREFIX)
+  AC_SUBST(THRIFT_INCLUDE)
+  AC_SUBST(THRIFT_LIB)
+  AC_SUBST(FB303_PREFIX)
+  AC_SUBST(FB303_INCLUDE)
+  AC_SUBST(FB303_LIB)
+  
+  # Configure path to Facebook Scribe.
+  AC_MSG_CHECKING([for scribe])
+  AC_ARG_WITH([scribe], [AC_HELP_STRING([--with-scribe=PATH], [path to installed Facebook Scribe [default=/usr/local]])], [
+    SCRIBE_PREFIX="${withval}"
+    SCRIBE_INCLUDE="${withval}/include"
+    SCRIBE_LIB="${withval}/lib"
+    AC_MSG_RESULT("${withval}")
+  ], [
+    SCRIBE_PREFIX="/usr/local"
+    SCRIBE_INCLUDE="/usr/local/include"
+    SCRIBE_LIB="/usr/local/lib"
+    AC_MSG_RESULT(/usr/local)
+  ])
+  AC_SUBST(SCRIBE_PREFIX)
+  AC_SUBST(SCRIBE_INCLUDE)
+  AC_SUBST(SCRIBE_LIB)
+
   LIBS="-L${THRIFT_LIB} -L${FB303_LIB} -L${SCRIBE_LIB} ${default_LIBS}"
   AC_CHECK_LIB([thrift], [_init], [], [AC_MSG_ERROR([couldn't find a suitable libthrift, use --with-thrift=PATH])])
   AC_CHECK_LIB([fb303], [_init], [], [AC_MSG_ERROR([couldn't find a suitable libfb303, use --with-thrift=PATH])])
   AC_CHECK_LIB([scribe], [_init], [], [AC_MSG_ERROR([couldn't find a suitable libscribe, use --with-scribe=PATH])])
+
   AM_CONDITIONAL([WANT_LOG], true)
   AC_DEFINE([WANT_LOG], 1, [enable Log component])
 else