X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=inline;f=config%2Fgrc_mblock.m4;h=e262f25b8613d79ce9528c622b5064b5501fac97;hb=642d5860b15175e4540f59afccb1ab20d8bc7d1f;hp=d5020a65b49618a766a6abf08febe369e31e65c1;hpb=0bf2128a621ae84099f43744e1b81800f2b9d2d7;p=debian%2Fgnuradio

diff --git a/config/grc_mblock.m4 b/config/grc_mblock.m4
index d5020a65..e262f25b 100644
--- a/config/grc_mblock.m4
+++ b/config/grc_mblock.m4
@@ -1,10 +1,10 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
 dnl GNU Radio is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
+dnl the Free Software Foundation; either version 3, or (at your option)
 dnl any later version.
 dnl 
 dnl GNU Radio is distributed in the hope that it will be useful,
@@ -18,45 +18,39 @@ dnl the Free Software Foundation, Inc., 51 Franklin Street,
 dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_MBLOCK],[
-    GRC_ENABLE([mblock])
+    GRC_ENABLE(mblock)
 
-    AC_CONFIG_FILES([\
-	mblock/Makefile \
-	mblock/doc/Makefile \
-	mblock/src/Makefile \
-	mblock/src/lib/Makefile \
-	mblock/src/scheme/Makefile \
-	mblock/src/scheme/gnuradio/Makefile \
-    ])
+    GRC_WITH(mblock)
 
-    passed=yes
-    # Don't do mblock if omnithread skipped
-    # There *has* to be a better way to check if a value is in a string
-    for dir in $skipped_dirs
-    do
-	if test x$dir = xomnithread; then
-	    AC_MSG_RESULT([Component mblock requires omnithread, which is not being built.])
-	    passed=no
-	fi
-    done
+    dnl Don't do mblock if omnithread or pmt skipped
+    GRC_CHECK_DEPENDENCY(mblock, pmt)
+    GRC_CHECK_DEPENDENCY(mblock, omnithread)
 
-    # Don't do mblock if pmt skipped
-    # There *has* to be a better way to check if a value is in a string
-    for dir in $skipped_dirs
-    do
-	if test x$dir = xpmt; then
-	    AC_MSG_RESULT([Component mblock requires pmt, which is not being built.])
-	    passed=no
-	fi
-    done
-
-    AC_PATH_PROG(GUILE,guile)
-    if test "$GUILE" = "" ; then
-      AC_MSG_RESULT([Component mblock requires guile, which was not found.])
-      passed=no
+    dnl If execution gets to here, $passed will be:
+    dnl   with : if the --with code didn't error out
+    dnl   yes  : if the --enable code passed muster and all dependencies are met
+    dnl   no   : otherwise
+    if test $passed = yes; then
+	dnl Don't do mblock if guile not available
+	GRC_CHECK_GUILE(mblock)
+    fi
+    if test $passed != with; then
+	dnl how and where to find INCLUDES and LA
+	mblock_INCLUDES="-I\${abs_top_srcdir}/mblock/src/lib"
+        mblock_LA="\${abs_top_builddir}/mblock/src/lib/libmblock.la"
     fi
 
-    GRC_BUILD_CONDITIONAL([mblock],[
+    AC_CONFIG_FILES([\
+        mblock/Makefile \
+        mblock/mblock.pc \
+        mblock/doc/Makefile \
+        mblock/src/Makefile \
+        mblock/src/lib/Makefile \
+        mblock/src/scheme/Makefile \
+        mblock/src/scheme/gnuradio/Makefile \
+    ])
+
+    GRC_BUILD_CONDITIONAL(mblock,[
         dnl run_tests is created from run_tests.in.  Make it executable.
 	dnl AC_CONFIG_COMMANDS([run_tests_mblock], [chmod +x mblock/src/python/run_tests])
     ])