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

[jcorgan]

Author: jcorgan
Date: 2006-08-22 01:07:52 -0600 (Tue, 22 Aug 2006)
New Revision: 3373

Modified:
   gnuradio/branches/developers/jcorgan/ticket-28/Makefile.am
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_core.m4
   gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implemented ticket:28 for gnuradio-core in jcorgan/ticket-28.

Modified: gnuradio/branches/developers/jcorgan/ticket-28/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/Makefile.am  2006-08-22 
02:19:29 UTC (rev 3372)
+++ gnuradio/branches/developers/jcorgan/ticket-28/Makefile.am  2006-08-22 
07:07:52 UTC (rev 3373)
@@ -26,5 +26,5 @@
        configure                       \
        config.h.in
 
-SUBDIRS = @subdirs@
-DIST_SUBDIRS = @subdirs@ @failed_subdirs@
+SUBDIRS = @build_dirs@
+DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @failed_dirs@

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 02:19:29 UTC (rev 3372)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gnuradio_core.m4  
2006-08-22 07:07:52 UTC (rev 3373)
@@ -18,6 +18,14 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GNURADIO_CORE],[
+    AC_ARG_ENABLE([gnuradio-core],
+                  [  --enable-gnuradio-core help string],
+                 [case $enableval in 
+                     yes|no) ;; 
+                     *) AC_MSG_ERROR([Invalid value passed to 
--enable-gnuradio-core]) ;; 
+                  esac],
+                 [enable_gnuradio_core=$enable_all_components])
+
     AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc])
 
     AC_CONFIG_FILES([ \
@@ -53,11 +61,16 @@
         gnuradio-core/src/utils/Makefile \
        ])
 
-    dnl run_tests is created from run_tests.in.  Make it executable.
-    AC_CONFIG_COMMANDS([run_tests_core], [chmod +x 
gnuradio-core/src/python/gnuradio/gr/run_tests])
+    if test x$enable_gnuradio_core != xno; then
+        dnl run_tests is created from run_tests.in.  Make it executable.
+        AC_CONFIG_COMMANDS([run_tests_core], [chmod +x 
gnuradio-core/src/python/gnuradio/gr/run_tests])
 
-    dnl kludge up initial swig dependency file
-    AC_CONFIG_COMMANDS([swig_deps], [touch 
gnuradio-core/src/lib/swig/gnuradio_swig_python.d])
+        dnl kludge up initial swig dependency file
+        AC_CONFIG_COMMANDS([swig_deps], [touch 
gnuradio-core/src/lib/swig/gnuradio_swig_python.d])
 
-    subdirs="$subdirs gnuradio-core"
+        build_dirs="$build_dirs gnuradio-core"
+    else
+        skipped_dirs="$skipped_dirs gnuradio-core"
+    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 
02:19:29 UTC (rev 3372)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-22 
07:07:52 UTC (rev 3373)
@@ -149,64 +149,86 @@
 
 dnl Component specific configuration
 dnl The order of the GR_ macros determines the order of compilation
-subdirs="config"
+AC_ARG_ENABLE([all-components],
+              [  --enable-all-components Build all components or stop on 
failed dependencies],
+             [
+              case $enableval in
+                  yes|no) ;;
+                  *) AC_MSG_ERROR([Invalid value passed to 
--enable-all-components]) ;;
+              esac
+             ])
+
+build_dirs="config"
 GRC_GNURADIO_CORE
-GRC_GNURADIO_EXAMPLES
-GRC_USRP
-GRC_GR_USRP                    dnl this must come after GRC_USRP
-GRC_GR_AUDIO_ALSA
-GRC_GR_AUDIO_JACK
-GRC_GR_AUDIO_OSS
-GRC_GR_AUDIO_OSX
-GRC_GR_AUDIO_PORTAUDIO         dnl ***NOT TESTED***
-GRC_GR_AUDIO_WINDOWS           dnl ***NOT TESTED***
-GRC_GR_ATSC
-GRC_GR_COMEDI
-dnl GRC_GR_ERROR_CORRECTING_CODES  dnl disabled until fix for ticket:36
-GRC_GR_GSM_FR_VOCODER
-GRC_GR_RADAR
-GRC_GR_RADIO_ASTRONOMY
-GRC_GR_VIDEO_SDL
-GRC_GR_WXGUI
-GRC_PMT
-GRC_MBLOCK                     dnl this must come after GRC_PMT
-GRC_GR_TRELLIS
-GRC_EZDOP              
-GRC_GR_EZDOP                   dnl this must come after GRC_EZDOP
+#GRC_GNURADIO_EXAMPLES
+#GRC_USRP
+#GRC_GR_USRP                   dnl this must come after GRC_USRP
+#GRC_GR_AUDIO_ALSA
+#GRC_GR_AUDIO_JACK
+#GRC_GR_AUDIO_OSS
+#GRC_GR_AUDIO_OSX
+#GRC_GR_AUDIO_PORTAUDIO                dnl ***NOT TESTED***
+#GRC_GR_AUDIO_WINDOWS          dnl ***NOT TESTED***
+#GRC_GR_ATSC
+#GRC_GR_COMEDI
+#dnl GRC_GR_ERROR_CORRECTING_CODES  dnl disabled until fix for ticket:36
+#GRC_GR_GSM_FR_VOCODER
+#GRC_GR_RADAR
+#GRC_GR_RADIO_ASTRONOMY
+#GRC_GR_VIDEO_SDL
+#GRC_GR_WXGUI
+#GRC_PMT
+#GRC_MBLOCK                    dnl this must come after GRC_PMT
+#GRC_GR_TRELLIS
+#GRC_EZDOP             
+#GRC_GR_EZDOP                  dnl this must come after GRC_EZDOP
 
-dnl Has list of successfully configured components
-AC_SUBST([subdirs],$subdirs)
-AC_SUBST([failed_subdirs], $failed)
+# Each component is now either to be built, was skipped, or failed dependencies
+AC_SUBST([build_dirs], [$build_dirs])
+AC_SUBST([skipped_dirs], [$skipped_dirs])
+AC_SUBST([failed_dirs], [$failed_dirs])
  
 AC_CONFIG_FILES([\
-         Makefile \
-         config/Makefile
+    Makefile \
+    config/Makefile
 ])
 
 AC_OUTPUT
 
 echo
-echo "*******************************************************************"
+echo "*********************************************************************"
 echo The following GNU Radio components have been successfully configured:
 echo 
-for dir in $subdirs
+for dir in $build_dirs
 do
     echo $dir
 done
 echo
-if test "$failed" != ""; then
-    echo However, the following components did not configure successfully due 
to 
-    echo missing dependencies:
+echo You my now run the 'make' command to build these components.
+echo
+if test "$skipped_dirs" != ""; then
+    echo 
"*********************************************************************"
+    echo The following components were skipped either because you asked not
+    echo to build them or they didn\'t pass configuration checks:
     echo
-    for dir in $failed
+    for dir in $skipped_dirs
     do
         echo $dir
     done
     echo
-    echo You may still run the 'make' command to build the successfully 
configured
-    echo components.
+    echo These components will not be built.
     echo
-    #exit 1
 fi
-echo You my now run the 'make' command to build these packages.
-echo
+if test "$failed_dirs" != ""; then
+    echo 
"**ERROR*ERROR*ERROR*ERROR*ERROR*ERROR*ERROR*ERROR*ERROR*ERROR*ERROR**"
+    echo
+    echo The following components failed their configuration checks\, and you
+    echo specifically asked them to be built:
+    echo
+    for dir in $failed_dirs
+    do
+        echo $dir
+    done
+    echo
+    exit 1
+fi