Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio...

[debian/gnuradio] / config / grc_gr_utils.m4

diff --git a/config/grc_gr_utils.m4 b/config/grc_gr_utils.m4
index e5b3a6afbacf53eb58031e1ec42e3613e1fba684..34f56da1e210fb31bd6e4d296fe2375b4642ed52 100644 (file)
--- a/config/grc_gr_utils.m4
+++ b/config/grc_gr_utils.m4
@@ -1,4 +1,4 @@
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -29,22 +29,18 @@ AC_DEFUN([GRC_GR_UTILS],[
 
     passed=yes
     # Don't do gr-utils if gnuradio-core, usrp, or gr-wxgui 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 = xusrp; then
-           AC_MSG_RESULT([Component gr-utils requires usrp, which is not being built.])
-           passed=no
-       fi
-       if test x$dir = xgnuradio-core; then
-           AC_MSG_RESULT([Component gr-utils requires gnuradio-core, which is not being built.])
-           passed=no
-       fi
-       if test x$dir = xgr-wxgui; then
-           AC_MSG_RESULT([Component gr-utils requires gr-wxgui, which is not being built.])
-           passed=no
-       fi
-    done
+    if test x$gnuradio_core_skipped = xyes; then
+        AC_MSG_RESULT([Component gr-utils requires gnuradio-core, which is not being built or specified via pre-installed files.])
+        passed=no
+    fi
+    if test x$usrp_skipped = xyes; then
+        AC_MSG_RESULT([Component gr-utils requires usrp, which is not being built or specified via pre-installed files.])
+        passed=no
+    fi
+    if test x$gr_wxgui_skipped = xyes; then
+        AC_MSG_RESULT([Component gr-utils requires gr-wxgui, which is not being built or specified via pre-installed files.])
+        passed=no
+    fi
 
     GRC_BUILD_CONDITIONAL([gr-utils])
 ])