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

[jcorgan]

Author: jcorgan
Date: 2006-08-22 10:39:36 -0600 (Tue, 22 Aug 2006)
New Revision: 3374

Modified:
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_core.m4
   
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_examples.m4
   gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implemented ticket:28 for gnuradio-examples in branch jcorgan/ticket-28.

Note: AC_CONFIG_SRCDIR is *not* cumulative, so all the config statements
in the *.m4 config files have been useless.  So the SRCDIR check from 
gnuradio-core was moved to the top-level configure.ac and the individual
ones will be removed from the grc_*.m4 files during this implementation.


Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_core.m4  
2006-08-22 07:07:52 UTC (rev 3373)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_core.m4  
2006-08-22 16:39:36 UTC (rev 3374)
@@ -26,8 +26,6 @@
                   esac],
                  [enable_gnuradio_core=$enable_all_components])
 
-    AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc])
-
     AC_CONFIG_FILES([ \
         gnuradio-core/Makefile
         gnuradio-core/gnuradio-core.pc \

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_examples.m4
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_examples.m4  
    2006-08-22 07:07:52 UTC (rev 3373)
+++ 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_examples.m4  
    2006-08-22 16:39:36 UTC (rev 3374)
@@ -18,7 +18,13 @@
 # Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
-    AC_CONFIG_SRCDIR([gnuradio-examples/README])
+    AC_ARG_ENABLE([gnuradio-examples],
+                  [  --enable-gnuradio-examples help string],
+                 [case $enableval in 
+                     yes|no) ;; 
+                     *) AC_MSG_ERROR([Invalid value passed to 
--enable-gnuradio-examples]) ;; 
+                  esac],
+                 [enable_gnuradio_examples=$enable_all_components])
 
     AC_CONFIG_FILES([\
         gnuradio-examples/Makefile \
@@ -32,5 +38,10 @@
         gnuradio-examples/python/multi_usrp/Makefile \
        ])
 
-    subdirs="$subdirs gnuradio-examples"
+    if test x$enable_gnuradio_examples != xno; then
+        build_dirs="$build_dirs gnuradio-examples"
+    else
+        skipped_dirs="$skipped_dirs gnuradio-examples"
+    fi
+    dnl N.B. there are no failures we check for, so there is no code to 
manipulate $failed_dirs
 ])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-22 
07:07:52 UTC (rev 3373)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-22 
16:39:36 UTC (rev 3374)
@@ -23,6 +23,7 @@
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE(gnuradio,2.8svn)
+AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc])
 
 GR_X86_64              dnl check for lib64 suffix
 LF_CONFIGURE_CC
@@ -160,7 +161,7 @@
 
 build_dirs="config"
 GRC_GNURADIO_CORE
-#GRC_GNURADIO_EXAMPLES
+GRC_GNURADIO_EXAMPLES
 #GRC_USRP
 #GRC_GR_USRP                   dnl this must come after GRC_USRP
 #GRC_GR_AUDIO_ALSA