[Commit-gnuradio] r9321 - gnuradio/branches/developers/eb/ac-wip/config

[eb]

Author: eb
Date: 2008-08-18 19:58:23 -0600 (Mon, 18 Aug 2008)
New Revision: 9321

Modified:
   gnuradio/branches/developers/eb/ac-wip/config/ax_boost_base.m4
   gnuradio/branches/developers/eb/ac-wip/config/ax_boost_date_time.m4
Log:
more boost m4 hacking

Modified: gnuradio/branches/developers/eb/ac-wip/config/ax_boost_base.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_base.m4      
2008-08-19 01:08:30 UTC (rev 9320)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_base.m4      
2008-08-19 01:58:23 UTC (rev 9321)
@@ -296,3 +296,36 @@
                ],
                [want_boost="yes"])
 ])
+
+dnl $1 is unit name.  E.g., boost_thread
+dnl $2 is AC_LANG_PROGRAM argument 1
+dnl $3 is AC_LANG_PROGRAM argument 2
+dnl $4 is cv variable name.  E.g., ax_cv_boost_thread
+AC_DEFUN([_AX_BOOST_CHECK_],[
+    _AX_BOOST_WITH($1)
+    if test "$want_boost" = "yes"; then
+        AC_REQUIRE([AC_PROG_CC])
+        AC_REQUIRE([AC_PROG_CXX])
+        CPPFLAGS_SAVED="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+        LDFLAGS_SAVED="$LDFLAGS"
+        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+        AC_CACHE_CHECK([whether the boost::m4_substr([$1],6) library is 
available], [$4],
+                      [AC_LANG_PUSH([C++])
+                        
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([$2],[$3]),[$4]=yes,[$4]=no)
+                        AC_LANG_POP([C++])
+                       ])
+       if test "$[$4]" = "yes"; then
+           _AX_BOOST_CHECK_LIB([$1])
+       fi
+        CPPFLAGS="$CPPFLAGS_SAVED"
+        LDFLAGS="$LDFLAGS_SAVED"
+    fi
+])
+
+dnl $1 is unit name.  E.g., boost_thread
+dnl $2 is AC_LANG_PROGRAM argument 1
+dnl $3 is AC_LANG_PROGRAM argument 2
+AC_DEFUN([_AX_BOOST_CHECK],[
+    _AX_BOOST_CHECK_($1,$2,$3,ax_cv_$1)
+])

Modified: gnuradio/branches/developers/eb/ac-wip/config/ax_boost_date_time.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_date_time.m4 
2008-08-19 01:08:30 UTC (rev 9320)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_date_time.m4 
2008-08-19 01:58:23 UTC (rev 9321)
@@ -32,32 +32,7 @@
 AC_DEFUN([AX_BOOST_DATE_TIME],
 [
     AC_REQUIRE([AX_BOOST_BASE])        
-    _AX_BOOST_WITH([boost_date_time])
-
-    if test "$want_boost" = "yes"; then
-        AC_REQUIRE([AC_PROG_CC])
-        AC_REQUIRE([AC_PROG_CXX])
-        CPPFLAGS_SAVED="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-
-        LDFLAGS_SAVED="$LDFLAGS"
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-
-        AC_CACHE_CHECK(whether the boost::date_time library is available,
-                       ax_cv_boost_date_time,
-        [AC_LANG_PUSH([C++])
-         AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include 
<boost/date_time/gregorian/gregorian_types.hpp>]],
-                                   [[using namespace boost::gregorian; date 
d(2002,Jan,10);
-                                     return 0;
-                                   ]]),
-         ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)
-         AC_LANG_POP([C++])
-        ])
-        if test "$ax_cv_boost_date_time" = "yes"; then
-           _AX_BOOST_CHECK_LIB([boost_date_time])
-        fi
-
-        CPPFLAGS="$CPPFLAGS_SAVED"
-        LDFLAGS="$LDFLAGS_SAVED"
-    fi
+    _AX_BOOST_CHECK([boost_date_time],
+                   address@hidden:@include 
<boost/date_time/gregorian/gregorian_types.hpp>],
+                   [using namespace boost::gregorian; date d(2002,Jan,10); 
return 0;])
 ])