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

[jcorgan]

Author: jcorgan
Date: 2006-08-23 23:34:42 -0600 (Wed, 23 Aug 2006)
New Revision: 3401

Modified:
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_ezdop.m4
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_ezdop.m4
   gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implements ticket:28 for ezdop and gr-ezdop.

Modified: gnuradio/branches/developers/jcorgan/ticket-28/config/grc_ezdop.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_ezdop.m4  
2006-08-24 05:26:02 UTC (rev 3400)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_ezdop.m4  
2006-08-24 05:34:42 UTC (rev 3401)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_EZDOP],[
-    AC_CONFIG_SRCDIR([ezdop/src/host/ezdop/ezdop.h])
+    GRC_ENABLE([ezdop])
 
     AC_CONFIG_FILES([ \
        ezdop/Makefile \
@@ -31,32 +31,37 @@
        ezdop/src/host/tests/Makefile \
     ])
 
-    succeeded=yes
+    passed=yes
 
     # Firmware build requires Atmel AVR microcontroller port of GCC
     AC_PATH_PROG([AVRGCC], [avr-gcc -v], [no])
     if test x$AVRGCC = xno; then
-       succeeded=no
+       passed=no
+       AC_MSG_RESULT([ezdop requires avr-gcc, not found.])
     fi
     
     # ...and binutils
     AC_PATH_PROG([AVROBJCOPY], [avr-objcopy], [no])
     if test x$AVROBJCOPY = xno; then
-       succeeded=no
+       passed=no
+       AC_MSG_RESULT([ezdop requires avr binutils, not found.])
     fi
     
     # ...and standard library (test not working yet)
-    #AC_CHECK_HEADERS([avr/io.h],[],[succeeded=no])
+    #AC_CHECK_HEADERS([avr/io.h],[],
+    #   [passed=no;AC_MSG_RESULT([ezdop requires avr glibc, not found.])])
 
     # Device access is via libftdi
     AC_LANG_PUSH(C)
-    AC_CHECK_HEADERS([ftdi.h],[],[succeeded=no])
+    AC_CHECK_HEADERS([ftdi.h],[],
+        [passed=no;AC_MSG_RESULT([ezdop requires ftdi.h, not found.])])
     save_LIBS="$LIBS"
-    AC_SEARCH_LIBS([ftdi_init], [ftdi],[FTDI_LIBS="$LIBS"],[succeeded=no])
+    AC_SEARCH_LIBS([ftdi_init], [ftdi],[FTDI_LIBS="$LIBS"],
+        [passed=no;AC_MSG_RESULT([ezdop requires libftdi, not found.])])
     LIBS="$save_LIBS"
     AC_LANG_POP
-    
-    if test x$succeeded = xyes; then
+
+    GRC_BUILD_CONDITIONAL([ezdop],[
        EZDOP_INCLUDES='-I$(top_srcdir)/ezdop/src/host/ezdop/ 
-I$(top_srcdir)/ezdop/src/firmware/'
        EZDOP_LIBS='-lezdop'
        AC_SUBST(FTDI_LIBS)
@@ -64,9 +69,5 @@
        AC_SUBST(EZDOP_LIBS)
        AC_SUBST(AVRGCC)
        AC_SUBST(AVROBJCOPY)
-
-        subdirs="$subdirs ezdop"
-    else
-       failed="$failed ezdop"
-    fi
+    ])
 ])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_ezdop.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_ezdop.m4       
2006-08-24 05:26:02 UTC (rev 3400)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_ezdop.m4       
2006-08-24 05:34:42 UTC (rev 3401)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GR_EZDOP],[
-    AC_CONFIG_SRCDIR([gr-ezdop/src/lib/ezdop.i])
+    GRC_ENABLE([gr-ezdop])
 
     AC_CONFIG_FILES([ \
        gr-ezdop/Makefile \
@@ -28,21 +28,18 @@
        gr-ezdop/src/python/run_tests \
     ])
 
+    passed=yes
     # Don't do gr-ezdop if ezdop failed
     # There *has* to be a better way to check if a value is in a string
-    succeeded=yes
-    for dir in $failed
+    for dir in $skipped_dirs
     do
        if test $dir = ezdop; then
-           succeeded=no
+           passed=no
        fi
     done
 
-    if test $succeeded = yes; then
+    GRC_BUILD_CONDITIONAL([gr-ezdop],[
        dnl run_tests is created from run_tests.in.  Make it executable.
        AC_CONFIG_COMMANDS([run_tests_ezdop], [chmod +x 
gr-ezdop/src/python/run_tests])
-       subdirs="$subdirs gr-ezdop"
-    else
-       failed="$failed gr-ezdop"
-    fi
+    ])
 ])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
05:26:02 UTC (rev 3400)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
05:34:42 UTC (rev 3401)
@@ -177,8 +177,8 @@
 GRC_GR_WXGUI
 GRC_PMT
 GRC_MBLOCK                     dnl this must come after GRC_PMT
-#GRC_EZDOP             
-#GRC_GR_EZDOP                  dnl this must come after GRC_EZDOP
+GRC_EZDOP              
+GRC_GR_EZDOP                   dnl this must come after GRC_EZDOP
 
 # Each component is now either to be built, was skipped, or failed dependencies
 AC_SUBST([build_dirs], [$build_dirs])