[Commit-gnuradio] r3400 - in gnuradio/branches/developers/jcorgan/ticket-28: . config

[jcorgan]

Author: jcorgan
Date: 2006-08-23 23:26:02 -0600 (Wed, 23 Aug 2006)
New Revision: 3400

Modified:
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_trellis.m4
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_mblock.m4
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_pmt.m4
   gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implemented ticket:28 for pmt, mblock, and gr-trellis.

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_trellis.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_trellis.m4     
2006-08-24 05:20:31 UTC (rev 3399)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_trellis.m4     
2006-08-24 05:26:02 UTC (rev 3400)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GR_TRELLIS],[
-    AC_CONFIG_SRCDIR([gr-trellis/src/lib/trellis.i])
+    GRC_ENABLE([gr-trellis])
 
     AC_CONFIG_FILES([\
        gr-trellis/Makefile \
@@ -29,8 +29,9 @@
        gr-trellis/src/python/run_tests \
     ])
 
-    dnl run_tests is created from run_tests.in.  Make it executable.
-    AC_CONFIG_COMMANDS([run_tests_gr_trellis], [chmod +x 
gr-trellis/src/python/run_tests])
-
-    subdirs="$subdirs gr-trellis"
+    passed=yes
+    GRC_BUILD_CONDITIONAL([gr-trellis],[
+        dnl run_tests is created from run_tests.in.  Make it executable.
+       AC_CONFIG_COMMANDS([run_tests_gr_trellis], [chmod +x 
gr-trellis/src/python/run_tests])
+    ])
 ])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/config/grc_mblock.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_mblock.m4 
2006-08-24 05:20:31 UTC (rev 3399)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_mblock.m4 
2006-08-24 05:26:02 UTC (rev 3400)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_MBLOCK],[
-    AC_CONFIG_SRCDIR([mblock/src/lib/mb_mblock.h])
+    GRC_ENABLE([mblock])
 
     AC_CONFIG_FILES([\
        mblock/Makefile \
@@ -27,8 +27,9 @@
        mblock/src/lib/Makefile
     ])
 
-    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])
-
-    subdirs="$subdirs mblock"
+    passed=yes
+    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])
+    ])
 ])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/config/grc_pmt.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_pmt.m4    
2006-08-24 05:20:31 UTC (rev 3399)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_pmt.m4    
2006-08-24 05:26:02 UTC (rev 3400)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_PMT],[
-    AC_CONFIG_SRCDIR([pmt/src/lib/pmt.h])
+    GRC_ENABLE([pmt])
 
     AC_CONFIG_FILES([\
        pmt/Makefile \
@@ -27,8 +27,9 @@
        pmt/src/lib/Makefile
     ])
 
-    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])
-
-    subdirs="$subdirs pmt"
+    passed=yes
+    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])
+    ])
 ])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
05:20:31 UTC (rev 3399)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
05:26:02 UTC (rev 3400)
@@ -172,11 +172,11 @@
 GRC_GR_GSM_FR_VOCODER
 GRC_GR_RADAR
 GRC_GR_RADIO_ASTRONOMY
+GRC_GR_TRELLIS
 GRC_GR_VIDEO_SDL
 GRC_GR_WXGUI
-#GRC_PMT
-#GRC_MBLOCK                    dnl this must come after GRC_PMT
-#GRC_GR_TRELLIS
+GRC_PMT
+GRC_MBLOCK                     dnl this must come after GRC_PMT
 #GRC_EZDOP             
 #GRC_GR_EZDOP                  dnl this must come after GRC_EZDOP