Re: CVS update: subversion/subversion/libsvn_ra_dav fetch.c

On Sat, Feb 17, 2001 at 11:52:07PM -0000, joe@tigris.org wrote:
>
> -conf=$1/configure
> +conf=$1/macros/neon.m4
>
> major=`sed -n '/NEON_VERSION_MAJOR=/s/.*=//p' $conf`
>
> @@ -17,4 +17,4 @@
> # current Neon releases
> minor=`sed -n '/NEON_VERSION_MINOR=/s/.*=//p' $conf`
> release=`sed -n '/NEON_VERSION_RELEASE=/s/.*=//p' $conf`
> -echo $major.$minor.$release
> \ No newline at end of file
> +echo $major.$minor.$release

Unfortunately, this fails to detect the version of an older verision
of neon (like 0.8.1). This patch fixes it:

Index: get-neon-ver.sh
===================================================================
RCS file: /cvs/subversion/ac-helpers/get-neon-ver.sh,v
retrieving revision 1.2
diff -u -c -r1.2 get-neon-ver.sh
cvs server: conflicting specifications of output style
*** get-neon-ver.sh 2001/02/17 23:52:06 1.2
--- get-neon-ver.sh 2001/02/18 10:08:46
***************
*** 4,19 ****
  #
  
  conf=$1/macros/neon.m4
  
  major=`sed -n '/NEON_VERSION_MAJOR=/s/.*=//p' $conf`
  
  # older versions of Neon
  if test "$major" = ""; then
! vsn=`sed -n '/NEON_VERSION=/s/.*=//p' $conf`
    echo $vsn
    exit 0
  fi
!
  # current Neon releases
  minor=`sed -n '/NEON_VERSION_MINOR=/s/.*=//p' $conf`
  release=`sed -n '/NEON_VERSION_RELEASE=/s/.*=//p' $conf`
--- 4,20 ----
  #
  
  conf=$1/macros/neon.m4
+ oldconf=$1/configure.in
  
  major=`sed -n '/NEON_VERSION_MAJOR=/s/.*=//p' $conf`
  
  # older versions of Neon
  if test "$major" = ""; then
! vsn=`sed -n '/NEON_VERSION=/s/.*=//p' $oldconf`
    echo $vsn
    exit 0
  fi
! echo "foobar"
  # current Neon releases
  minor=`sed -n '/NEON_VERSION_MINOR=/s/.*=//p' $conf`
  release=`sed -n '/NEON_VERSION_RELEASE=/s/.*=//p' $conf`

           
        sam th
        sam@uchicago.edu
        http://www.abisource.com/~sam/
        GnuPG Key:
        http://www.abisource.com/~sam/key