diff options
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 17 |
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" |