[Commit-gnuradio] r8747 - gnuradio/branches/developers/eb/sched-wip

[eb]

Author: eb
Date: 2008-06-28 21:25:15 -0600 (Sat, 28 Jun 2008)
New Revision: 8747

Added:
   gnuradio/branches/developers/eb/sched-wip/README.building-boost-1.35.0
Modified:
   gnuradio/branches/developers/eb/sched-wip/Makefile.common
   gnuradio/branches/developers/eb/sched-wip/configure.ac
Log:
Enable new boost m4 macros.  Require boost 1.35 or later.  Added
directions on how to build and use boost 1.35.0 if not the default
version on your system.



Modified: gnuradio/branches/developers/eb/sched-wip/Makefile.common
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/Makefile.common   2008-06-29 
03:22:36 UTC (rev 8746)
+++ gnuradio/branches/developers/eb/sched-wip/Makefile.common   2008-06-29 
03:25:15 UTC (rev 8747)
@@ -105,7 +105,7 @@
 
 # This used to be set in configure.ac but is now defined here for all 
 # Makefiles when this fragment is included.
-STD_DEFINES_AND_INCLUDES=$(DEFINES) $(OMNITHREAD_INCLUDES) 
$(GNURADIO_INCLUDES) $(BOOST_CFLAGS)
+STD_DEFINES_AND_INCLUDES=$(DEFINES) $(OMNITHREAD_INCLUDES) 
$(GNURADIO_INCLUDES) $(BOOST_CPPFLAGS)
 
 # Fix for BSD make not defining $(RM).  We define it now in configure.ac
 # using AM_PATH_PROG, but now here have to add a -f to be like GNU make

Added: gnuradio/branches/developers/eb/sched-wip/README.building-boost-1.35.0
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/README.building-boost-1.35.0      
                        (rev 0)
+++ gnuradio/branches/developers/eb/sched-wip/README.building-boost-1.35.0      
2008-06-29 03:25:15 UTC (rev 8747)
@@ -0,0 +1,37 @@
+Download boost_1_35_0.tar.bz2 from boost.sourceforge.net
+
+unpack it somewhere
+cd into the resulting directory
+
+$ cd boost_1_35_0
+
+# Pick a prefix to install it into.  I used /opt/boost_1_35_0
+
+$ BOOST_PREFIX=/opt/boost_1_35_0
+
+$ ./configure --prefix=$BOOST_PREFIX --with-libraries=thread,date_time
+
+# IMPORTANT!!!!  Edit the generated Makefile!
+# Find the line that contains BJAM_CONFIG and make it read:
+
+  BJAM_CONFIG= --layout=system
+
+# If you don't do this boost will get installed with really screwy paths.
+
+# Now that you're done editing the Makefile as instructed above...
+
+$ make
+$ make install
+
+----------------------------------------------------------------
+
+Now, tell gnuradio where to find it:
+
+$ cd <path-to-gnuradio-trunk>
+$ ./bootstrap
+
+$ ./configure --with-boost=$BOOST_PREFIX  # plus whatever config args you 
usually use
+
+$ make && make check
+$ sudo make install
+

Modified: gnuradio/branches/developers/eb/sched-wip/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/configure.ac      2008-06-29 
03:22:36 UTC (rev 8746)
+++ gnuradio/branches/developers/eb/sched-wip/configure.ac      2008-06-29 
03:25:15 UTC (rev 8747)
@@ -220,8 +220,26 @@
 
 dnl Define where to find boost includes
 dnl defines BOOST_CFLAGS
-GR_REQUIRE_BOOST_INCLUDES
+dnl GR_REQUIRE_BOOST_INCLUDES
 
+
+dnl
+dnl Move to config subdir when sorted out
+dnl
+dnl calls AC_SUBST(BOOST_CPPFLAGS) and AC_SUBST(BOOST_LDFLAGS)
+dnl and sets HAVE_BOOST
+AX_BOOST_BASE([1.35.0])
+
+dnl calls AC_SUBST(BOOST_THREAD_LIB)
+dnl and sets HAVE_BOOST_THREAD
+AX_BOOST_THREAD
+CXXFLAGS="${CXXFLAGS} $BOOST_CXXFLAGS"
+
+dnl calls AC_SUBST(BOOST_DATE_TIME_LIB)
+dnl and sets HAVE_BOOST_DATE_TIME
+AX_BOOST_DATE_TIME
+
+
 dnl If this is being done from a subversion tree, create variables
 GR_SUBVERSION