summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorTar Committer <tar@ocjtech.us>2004-06-06 04:12:54 +0000
committerTar Committer <tar@ocjtech.us>2004-06-06 04:12:54 +0000
commit654a4573f8fd2b1109e0ded8d9ce061dd3a2093f (patch)
treee1d9f6fdea04a52f7cfcdc1b3ddf9d49046d20df /configure.in
parent381d322caf5928732f3d478d80e70acfccd67f99 (diff)
downloadrancid-654a4573f8fd2b1109e0ded8d9ce061dd3a2093f.tar.gz
rancid-654a4573f8fd2b1109e0ded8d9ce061dd3a2093f.tar.xz
rancid-654a4573f8fd2b1109e0ded8d9ce061dd3a2093f.zip
Imported from rancid-2.3.1.tar.gz.rancid-2.3.1
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in17
1 files changed, 13 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index cab2f8d..588ab80 100644
--- a/configure.in
+++ b/configure.in
@@ -137,11 +137,20 @@ _DIFF_PATH=`echo $PATH:${prefix}/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:/usr/g
for _diff in ${_DIFF_PATH} ;
do
if test -e ${_diff}/diff ; then
- ${_diff}/diff -u /dev/null /dev/null > /dev/null 2>&1
+ ${_diff}/diff -u -4 /dev/null /dev/null > /dev/null 2>&1
if test $? -ne 0; then
- if test "${ADIFF}" == "" ; then
- ADIFF="${_diff}/diff"
- ADIFF_CMD="diff -c -4"
+ # linux/gnu shit has to change options that have been around
+ # since organized religion; see if -U 4 works.
+ ${_diff}/diff -U 4 /dev/null /dev/null > /dev/null 2>&1
+ if test $? -ne 0; then
+ if test "${ADIFF}" == "" ; then
+ ADIFF="${_diff}/diff"
+ ADIFF_CMD="diff -c -4"
+ fi
+ else
+ DIFF="${_diff}/diff"
+ DIFF_CMD="diff -U 4"
+ break
fi
else
DIFF="${_diff}/diff"