X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_gr_pager.m4;h=cdd6177af1f17fee05e21ca9ecd6698afa9fb4f9;hb=04db1ec3b6dad9d984f7fe4314cca6937c94a1b0;hp=cfd0d25b4d71484c0e7baf516adfea6253662240;hpb=42d9c6f495503d3d9d2db47a9979036c9233f976;p=debian%2Fgnuradio

diff --git a/config/grc_gr_pager.m4 b/config/grc_gr_pager.m4
index cfd0d25b..cdd6177a 100644
--- a/config/grc_gr_pager.m4
+++ b/config/grc_gr_pager.m4
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
+dnl Copyright 2006,2008,2009 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -18,23 +18,24 @@ dnl the Free Software Foundation, Inc., 51 Franklin Street,
 dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GR_PAGER],[
-    GRC_ENABLE([gr-pager])
+    GRC_ENABLE(gr-pager)
+
+    dnl Don't do gr-pager if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-pager, gnuradio-core)
 
     AC_CONFIG_FILES([\
-	gr-pager/Makefile \
-	gr-pager/src/Makefile \
-	gr-pager/src/run_tests
+        gr-pager/Makefile \
+	gr-pager/gnuradio-pager.pc \
+	gr-pager/apps/Makefile \
+	gr-pager/grc/Makefile \
+        gr-pager/lib/Makefile \
+	gr-pager/python/Makefile \
+	gr-pager/python/run_tests \
+	gr-pager/swig/Makefile \
     ])
 
-    passed=yes
-    # Don't do gr-pager if gnuradio-core skipped
-    if test x$gnuradio_core_skipped = xyes; then
-        AC_MSG_RESULT([Component gr-pager requires gnuradio-core, which is not being built or specified via pre-installed files.])
-	passed=no
-    fi
-
-    GRC_BUILD_CONDITIONAL([gr-pager],[
+    GRC_BUILD_CONDITIONAL(gr-pager,[
         dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_pager], [chmod +x gr-pager/src/run_tests])
+        AC_CONFIG_COMMANDS([run_tests_pager], [chmod +x gr-pager/python/run_tests])
     ])
 ])