[rhmessaging-commits] rhmessaging commits: r3756 - mgmt/trunk/sesame/cpp.

[rhmessaging-commits at lists.jboss.org]

Author: tedross
Date: 2010-01-05 16:43:46 -0500 (Tue, 05 Jan 2010)
New Revision: 3756

Modified:
   mgmt/trunk/sesame/cpp/configure.ac
Log:
Added support for vpath qpid builds

Modified: mgmt/trunk/sesame/cpp/configure.ac
===================================================================
--- mgmt/trunk/sesame/cpp/configure.ac	2009-12-21 22:54:54 UTC (rev 3755)
+++ mgmt/trunk/sesame/cpp/configure.ac	2010-01-05 21:43:46 UTC (rev 3756)
@@ -80,6 +80,10 @@
   [AS_HELP_STRING([--with-qpid-checkout],
     [Location of qpid checkout to build against (by default use installed qpid)])])
 
+AC_ARG_WITH([qpid-build],
+  [AS_HELP_STRING([--with-qpid-build],
+    [Qpid build directory if different from --with-qpid-checkout])])
+
 if test x$with_qpid_checkout != x; then
    QPID_DIR=$with_qpid_checkout
    QPID_SRC=$QPID_DIR/cpp/src
@@ -101,7 +105,15 @@
     AC_MSG_ERROR([Missing required qpid libraries/headers. Install package qmf-devel or use --with-qpid-checkout])
   QPID_LIBS="-lqmfagent"
   QPID_CXXFLAGS="-I$includedir/qpid-boost"
-fi   
+fi
+
+if test x$with_qpid_build != x; then
+   test x$with_qpid_checkout != x || AC_MSG_ERROR([--with-qpid-build requires --with-qpid-checkout])
+   QPID_BLD=$with_qpid_build
+   QPID_LIBS="$QPID_BLD/src/libqmf.la"
+   QPID_CXXFLAGS="-I$QPID_DIR/cpp/include -I$QPID_SRC -I$QPID_BLD/include -I$QPID_BLD/src"
+fi
+
 AC_SUBST([QMF_GEN])
 AC_SUBST([QPID_DIR])
 AC_SUBST([QPID_INCLUDE])