diff options
| author | gdt | 2008-03-16 22:09:12 +0000 |
|---|---|---|
| committer | gdt | 2008-03-16 22:09:12 +0000 |
| commit | 00f4fd98fb3532e3a15f92c6403bebe878075f5e (patch) | |
| tree | beab24c96e4e77098fb41102e5cf09c077f25eac | |
| parent | c5652769dcc55973895a13f3938f2c2f7217e107 (diff) | |
| download | gnuradio-00f4fd98fb3532e3a15f92c6403bebe878075f5e.tar.gz gnuradio-00f4fd98fb3532e3a15f92c6403bebe878075f5e.tar.bz2 gnuradio-00f4fd98fb3532e3a15f92c6403bebe878075f5e.zip | |
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.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8033 221aa14e-8319-0410-a670-987f0aec2ac5
| -rw-r--r-- | config/gr_subversion.m4 | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/config/gr_subversion.m4 b/config/gr_subversion.m4 index 7a415219d..849d7a9f6 100644 --- a/config/gr_subversion.m4 +++ b/config/gr_subversion.m4 @@ -23,19 +23,10 @@ dnl # # 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 |