Handle new property_list.hpp location in boost

Have I mentioned that I hate it when library developers move their
headers around? Change the location of the property_list.hpp header
to a macro and add a new -DNEWER_BOOT define that swtiches this to
the newer location.

Not automatically detected yet; should be checked in configure.

assign/GNUmakefile.in

@@ -31,8 +31,9 @@ OBJS=parse_top.o parse_ptop.o assign.o pclass.o vclass.o score.o \
 LIBS+= -lm
 LDFLAGS+= -pipe -O3
 CXXFLAGS = -pipe -I/usr/local/include -ftemplate-depth-40
-# For OSX w/ fink
-CXXFLAGS += -I/sw/include
+# For OSX w/ macports
+CXXFLAGS += -I/opt/local/include
+LIBS += -L/opt/local/lib
 
 ifeq ($(HAVE_XERCES),yes)
 CXXFLAGS += -DWITH_XML

assign/assign.cc

@@ -8,7 +8,7 @@
 
 #include <boost/config.hpp>
 #include <boost/utility.hpp>
-#include <boost/property_map.hpp>
+#include BOOST_PMAP_HEADER
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/dijkstra_shortest_paths.hpp>

assign/forwarding.h

@@ -14,7 +14,7 @@
 
 #include <boost/config.hpp>
 #include <boost/utility.hpp>
-#include <boost/property_map.hpp>
+#include BOOST_PMAP_HEADER
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/named_function_params.hpp>

assign/parse_top.cc

@@ -10,7 +10,7 @@ static const char rcsid[] = "$Id: parse_top.cc,v 1.42 2009-05-20 18:06:08 tarunp
 
 #include <boost/config.hpp>
 #include <boost/utility.hpp>
-#include <boost/property_map.hpp>
+#include BOOST_PMAP_HEADER
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
 

assign/parse_vtop_xml.cc

@@ -12,7 +12,7 @@ static const char rcsid[] = "$Id: parse_vtop_xml.cc,v 1.2 2009-05-20 18:06:08 ta
 
 #include <boost/config.hpp>
 #include <boost/utility.hpp>
-#include <boost/property_map.hpp>
+#include BOOST_PMAP_HEADER
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
 

assign/pclass.cc

@@ -27,7 +27,7 @@ using namespace __gnu_cxx;
 
 #include <boost/config.hpp>
 #include <boost/utility.hpp>
-#include <boost/property_map.hpp>
+#include BOOST_PMAP_HEADER
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
 

assign/physical.h

@@ -9,6 +9,7 @@
 
 #include "common.h"
 #include "delay.h"
+#include "port.h"
 
 #include <set>
 #include <list>
@@ -16,9 +17,9 @@ using namespace std;
 
 #include <boost/config.hpp>
 #include <boost/utility.hpp>
-#include <boost/property_map.hpp>
-#include <boost/graph/graph_traits.hpp>
+#include BOOST_PMAP_HEADER
 #include <boost/graph/adjacency_list.hpp>
+#include <boost/graph/graph_traits.hpp>
 using namespace boost;
 
 #include <string>

assign/port.h

@@ -43,5 +43,11 @@ using namespace __gnu_cxx;
 #include <slist>
 #endif
 
+#ifdef NEWER_BOOST
+#define BOOST_PMAP_HEADER <boost/property_map/property_map.hpp>
+#else
+#define BOOST_PMAP_HEADER <boost/property_map.hpp>
+#endif
+
 #else
 #endif

assign/score.cc

@@ -26,7 +26,7 @@ using namespace __gnu_cxx;
 
 #include <boost/config.hpp>
 #include <boost/utility.hpp>
-#include <boost/property_map.hpp>
+#include BOOST_PMAP_HEADER
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
 

assign/vclass.cc

@@ -12,7 +12,7 @@ static const char rcsid[] = "$Id: vclass.cc,v 1.13 2009-05-20 18:06:08 tarunp Ex
 
 #include <boost/config.hpp>
 #include <boost/utility.hpp>
-#include <boost/property_map.hpp>
+#include BOOST_PMAP_HEADER
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
 

assign/virtual.h

@@ -29,7 +29,7 @@ using namespace std;
 
 #include <boost/config.hpp>
 #include <boost/utility.hpp>
-#include <boost/property_map.hpp>
+#include BOOST_PMAP_HEADER
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/adjacency_list.hpp>
 using namespace boost;