[Commit-gnuradio] r8033 - gnuradio/trunk/config

[gdt]

Author: gdt
Date: 2008-03-16 16:09:12 -0600 (Sun, 16 Mar 2008)
New Revision: 8033

Modified:
   gnuradio/trunk/config/gr_subversion.m4
Log:
Use AC_PATH_PROG to avoid which(1).
In addition to testing if $SVN is non-null, require the presence of a
subversion ".svn" directory.
Confirmed working with svn builds.


Modified: gnuradio/trunk/config/gr_subversion.m4
===================================================================
--- gnuradio/trunk/config/gr_subversion.m4      2008-03-16 21:35:24 UTC (rev 
8032)
+++ gnuradio/trunk/config/gr_subversion.m4      2008-03-16 22:09:12 UTC (rev 
8033)
@@ -23,19 +23,10 @@
 #
 # Test for presence of subversion, and create variables for 
 # current repository version and last changed date.
-#
-# TODO: Fix the following problems in this code:
-#
-# 1. Remove use of non-standard program which (3.0BSD, not specified
-# by POSIX.
-#
-# 2. When operating on distribution tarballs (which do not have
-# subversion metadata) on machines that have subversion, do not
-# produce error message.
 
 AC_DEFUN([GR_SUBVERSION],[
-       AC_CHECK_PROG([SVN],[svn],[`which svn`])
-       if ! test -z $SVN ; then
+       AC_PATH_PROG([SVN],[svn])
+       if test "$SVN" != "" -a -d .svn ; then
            SVNVERSION=`$SVN info . | grep '^Revision' | cut -f 2- -d ' '`
            SVNDATE=`$SVN info . | grep 'Last Changed Date' | cut -f 4-6 -d ' '`
        fi