[Patch] configure.in and GNU diff/patch (was Re: r727 doesn't build w/ --disable-shared)

On Mon, Jan 07, 2002 at 10:44:44AM -0500, Garrett Rooney wrote:
> On Mon, Jan 07, 2002 at 03:29:33PM +0100, Roman Neuhauser wrote:
> > > Date: Sun, 6 Jan 2002 16:46:01 -0500
> > > From: Garrett Rooney <rooneg@electricjellyfish.net>
> > > To: svn <dev@subversion.tigris.org>
> > > Cc: neuhauser@mobil.cz
> > > Subject: Re: r727 doesn't build w/ --disable-shared
> > >
> > >
> > > > And BTW, issue #564 is not true: I had diff-2.7, patch-2.1.something
> > > > installed, and configure informed me that I needed diffutils.
> > >
> > > the version of patch and diff installed by default on FreeBSD are modified
> > > versions. the modification (i forget what exactly it is) causes it to not
> > > work with subversion, thus the diffutils and patch ports are needed.
> >
> > #564 is about ./configure telling the user to install diffutils
> > to get a recent GNU patch, when in fact patch is not part of
> > diffutils. And that was what ./configure told me. I don't know if
> > the FreeBSD diff is a modified version, diff --version told me just
> > "diff - GNU diffutils version 2.7", but my patch was old indeed.
> > That leads me to conclusion that the bug crept back in somehow.
>
> ahh, i see. i've had those ports installed long enough that i haven't
> noticed. if nobody else looks at this first i'll play with it
> tonight.

the error messages given by configure are not as intuitive as they
could be.... both the error for a bad version of patch and for a bad
version of diff point you to both the ftp site for patch and the ftp
site for diff, implying that you need to install both, even if only
one of them is out of date.

this patch clarifies the errors, and adds a pointer to the FreeBSD
port for diffutils to the part that notes how FreeBSD uses a hacked
version of diff.

also, while testing this i noticed that if one deletes the diff binary
that subversion is compiled to use, it will silently fail when you use
svn diff. i will investigate this, as it seems like it should be
throwing some kind of error.

-garrett

* configure.in
  (for GNU patch): clarify error message when a compatable version of
  patch cannot be found.
  (for non-broken GNU diff): clarify error message when a compatable
  version of diff cannot be found. Also expand the FreeBSD specific
  portion of the error with a pointer to the textproc/diffutils port,
  which provides the proper version of diff.

Index: ./configure.in
===================================================================
--- ./.svn/text-base/configure.in.svn-base Mon Jan 7 18:02:33 2002
+++ ./configure.in Mon Jan 7 18:54:47 2002
@@ -220,10 +220,8 @@
   AC_MSG_ERROR([not found
 
 Cannot find a GNU patch program in your PATH.
-Please make sure you have GNU diff (version 2.7 or later) and GNU
-patch (version 2.5 or later) installed. You can get them from
-ftp://ftp.gnu.org/pub/gnu/diffutils and ftp://ftp.gnu.org/pub/gnu/patch
-respectively.
+Please make sure you have and GNU patch (version 2.5 or later) installed.
+You can get it from ftp://ftp.gnu.org/pub/gnu/patch.
 ])
 fi
 AC_MSG_RESULT([$SVN_CLIENT_PATCH])
@@ -237,13 +235,13 @@
   AC_MSG_ERROR([not found
 
 Cannot find an unbroken GNU diff program in your PATH.
-Please make sure you have GNU diff (version 2.7 or later) and GNU
-patch (version 2.5 or later) installed. You can get them from
-ftp://ftp.gnu.org/pub/gnu/diffutils and ftp://ftp.gnu.org/pub/gnu/patch
-respectively.
+Please make sure you have GNU diff (version 2.7 or later) installed.
+You can get it from ftp://ftp.gnu.org/pub/gnu/diffutils.
 
 (Note that FreeBSD uses a *hacked* version of GNU diff that is unable
-to handle certain types of text files.)
+to handle certain types of text files. If you are using FreeBSD, please
+install the textproc/diffutils package to get the appropriate version of
+diff.)
 ])
 fi
 AC_MSG_RESULT([$SVN_CLIENT_DIFF])

-- 
garrett rooney                     Unix was not designed to stop you from 
rooneg@electricjellyfish.net       doing stupid things, because that would  
http://electricjellyfish.net/      stop you from doing clever things.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org