Merged r7769:7873 from michaelld/bc_behavior into trunk.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7888 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 26 insertions, 42 deletions

diff --git a/config/grc_pmt.m4 b/config/grc_pmt.m4
index 2a512273e..8e0a58bca 100644
--- a/config/grc_pmt.m4
+++ b/config/grc_pmt.m4
@@ -18,54 +18,38 @@ dnl the Free Software Foundation, Inc., 51 Franklin Street,
 dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_PMT],[
-    GRC_ENABLE([pmt])
-    GRC_WITH([pmt])
-    passed=no
-    if test x$with_pmt = xyes; then
-        if test x$enable_pmt = xyes; then
-	    AC_MSG_ERROR([Component pmt: Cannot use both --enable and --with])
-        else
-	    PKG_CHECK_MODULES(PMT, pmt, passed=with,
-	    	   AC_MSG_RESULT([Component pmt: PKGCONFIG cannot find info]))
-            if test x$passed = xwith; then
-                pmt_INCLUDES=`$PKG_CONFIG --cflags-only-I pmt`
-   	        pmt_LA=$PMT_LIBS
-            fi
-	fi
+    GRC_ENABLE(pmt)
+    GRC_WITH(pmt)
+
+    dnl Don't do pmt if omnithread skipped
+    GRC_CHECK_DEPENDENCY(pmt, omnithread)
+
+    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 pmt if guile not available
+	GRC_CHECK_GUILE(pmt)
     fi
-    dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff
-    dnl otherwise, $passed = no; check the "--enable" stuff
-    if test x$passed = xno; then
-        AC_CONFIG_FILES([\
-            pmt/Makefile \
-	    pmt/pmt.pc \
-	    pmt/doc/Makefile \
-	    pmt/src/Makefile \
-	    pmt/src/lib/Makefile \
-	    pmt/src/scheme/Makefile \
-	    pmt/src/scheme/gnuradio/Makefile \
-        ])
-	passed=yes
-	# Don't do pmt if omnithread skipped
-	if test x$omnithread_skipped = xyes; then
-	    AC_MSG_RESULT([Component pmt requires omnithread, which is not being built or specified via pre-installed files.])
-	    passed=no
-	fi
-	# Don't do pmt if guile not available
-        AC_PATH_PROG(GUILE,guile)
-        if test "$GUILE" = "" ; then
-            AC_MSG_RESULT([Component pmt requires guile, which was not found.])
-            passed=no
-        fi
+    if test $passed != with; then
+	dnl how and where to find INCLUDES and LA
 	pmt_INCLUDES="-I\${abs_top_srcdir}/pmt/src/lib"
         pmt_LA="\${abs_top_builddir}/pmt/src/lib/libpmt.la"
     fi
 
-    GRC_BUILD_CONDITIONAL([pmt],[
+    AC_CONFIG_FILES([\
+        pmt/Makefile \
+        pmt/pmt.pc \
+        pmt/doc/Makefile \
+        pmt/src/Makefile \
+        pmt/src/lib/Makefile \
+        pmt/src/scheme/Makefile \
+        pmt/src/scheme/gnuradio/Makefile \
+    ])
+
+    GRC_BUILD_CONDITIONAL(pmt,[
         dnl run_tests is created from run_tests.in.  Make it executable.
 	dnl AC_CONFIG_COMMANDS([run_tests_pmt], [chmod +x pmt/src/python/run_tests])
     ])
-
-    AC_SUBST([pmt_INCLUDES], [$pmt_INCLUDES])
-    AC_SUBST([pmt_LA], [$pmt_LA])
 ])