Author: tedross
Date: 2008-12-05 12:53:11 -0500 (Fri, 05 Dec 2008)
New Revision: 2935
Modified:
mgmt/trunk/sesame/cpp/configure.ac
mgmt/trunk/sesame/cpp/src/Makefile.am
Log:
Fixed configure and make to use correct boost headers
Modified: mgmt/trunk/sesame/cpp/configure.ac
===================================================================
--- mgmt/trunk/sesame/cpp/configure.ac 2008-12-05 17:24:34 UTC (rev 2934)
+++ mgmt/trunk/sesame/cpp/configure.ac 2008-12-05 17:53:11 UTC (rev 2935)
@@ -94,11 +94,12 @@
test $QMF_GEN = no &&
AC_MSG_ERROR([Missing required qmf-gen. Install package qmf-devel or use
--with-qpid-checkout])
- AC_CHECK_HEADERS([qpid/agent/ManagementAgent.h], , [fail=1])
+ AC_CHECK_HEADERS(qpid/agent/ManagementAgent.h, , [fail=1])
# Give any/all diagnostics before failing.
test $fail = 1 &&
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
AC_SUBST([QMF_GEN])
AC_SUBST([QPID_DIR])
Modified: mgmt/trunk/sesame/cpp/src/Makefile.am
===================================================================
--- mgmt/trunk/sesame/cpp/src/Makefile.am 2008-12-05 17:24:34 UTC (rev 2934)
+++ mgmt/trunk/sesame/cpp/src/Makefile.am 2008-12-05 17:53:11 UTC (rev 2935)
@@ -1,5 +1,5 @@
SUBDIRS = qmfgen
-sesame_CXXFLAGS = -I$(QPID_DIR)/cpp/src -I$(QPID_DIR)/cpp/src/gen -Iqmfgen \
+sesame_CXXFLAGS = $(QPID_CXXFLAGS) -Iqmfgen \
-DCONF_FILE=\"$(sysconfdir)/sesame/sesame.conf\" \
-DLOCSTATE_DIR=\"$(localstatedir)/lib/sesame\"
Show replies by date