Commit f81fe772 authored by Robert Ricci's avatar Robert Ricci

Auto-detect NEWER_BOOST for assign

Detect location of boost headers, since they moved in some recent
version.
(cherry picked from commit b7f6ae13)
parent 1c333acd
......@@ -9,6 +9,7 @@ OBJDIR = ..
SUBDIR = assign
MAKEFILE_IN = @srcdir@/GNUmakefile.in
HAVE_XERCES = @HAVE_XERCES@
NEWER_BOOST = @NEWER_BOOST@
include $(OBJDIR)/Makeconf
......@@ -41,6 +42,10 @@ LIBS += -L/usr/local/lib -lxerces-c
OBJS += parse_ptop_xml.o parse_vtop_xml.o parse_policy_xml.o parse_error_handler.o xmlhelpers.o parse_advertisement_rspec.o parse_request_rspec.o annotate_rspec_v2.o annotate_rspec.o annotate_vtop.o annotate.o rspec_parser_helper.o rspec_parser.o rspec_parser_v1.o rspec_parser_v2.o emulab_extensions_parser.o
endif
ifeq ($(NEWER_BOOST),yes)
CXXFLAGS += -DNEWER_BOOST
endif
# Pick either this
CXXFLAGS += -O3
# or this
......
This diff is collapsed.
......@@ -55,7 +55,7 @@ fi
AC_SUBST(PATH)
CPPFLAGS="-I/usr/local/include"
CPPFLAGS = "$CPPFLAGS -I/usr/local/include"
# BEGIN Python detection.
AC_PATH_PROGS(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2)
......@@ -793,13 +793,24 @@ fi
AC_SUBST(HAVE_MEZZANINE)
#
# Check for Xerces (required for XML support in assign).
# Check for a few things used by assign
#
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
#
# Check for Xerces (required for XML support in assign).
#
AC_CHECK_HEADER([xercesc/dom/DOM.hpp],[HAVE_XERCES=yes])
#
# Check for newer versions of boost, which have moved some headers
#
AC_CHECK_HEADER([boost/property_map/property_map.hpp],[NEWER_BOOST=yes])
AC_LANG_RESTORE
AC_SUBST(HAVE_XERCES)
AC_SUBST(NEWER_BOOST)
#
# Testing mode. In testing mode scripts should not effect hardware state.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment