* Added support for gdiff (for solaris)

svn: 1865

Makefile.in

@@ -27,6 +27,7 @@ LD = @DISTCC@ @CXX@
 CCDEBUG = @DISTCC@ @CCDEBUG@
 LDDEBUG = @DISTCC@ @CCDEBUG@
 STRIP = @STRIP@
+DIFF = @DIFF@
 
 #LIBS = @LIBS@ @ZLIB@ @SSL@ 
 LIBS = @LIBS@ @ZLIB@ 
@@ -132,7 +133,7 @@ help: makehelp stringfix
 	touch src/help.h; \
 	fi)
 	@src/stringfix src/help.h.tmp~ src/help.h~ 1
-	@(if test "x`diff -qurN src/help.h~ src/help.h`" != "x"; then \
+	@(if test "x`$(DIFF) -qurN src/help.h~ src/help.h`" != "x"; then \
 	cp -f src/help.h~ src/help.h; \
 	fi)
 
@@ -144,10 +145,10 @@ res: makeres
 	@(if [ ! -f src/responses.h ]; then \
 	touch src/responses.h; \
 	fi)
-	@(if test "x`diff -qurN src/response.h~ src/response.h`" != "x"; then \
+	@(if test "x`$(DIFF) -qurN src/response.h~ src/response.h`" != "x"; then \
 	cp -f src/response.h~ src/response.h; \
 	fi)
-	@(if test "x`diff -qurN src/responses.h~ src/responses.h`" != "x"; then \
+	@(if test "x`$(DIFF) -qurN src/responses.h~ src/responses.h`" != "x"; then \
 	cp -f src/responses.h~ src/responses.h; \
 	fi)
 

autotools/configure.ac

@@ -43,6 +43,7 @@ EGG_PROG_AWK
 EGG_PROG_BASENAME
 AC_CHECK_PROG(OBJCOPY, objcopy, [objcopy --remove-section=.note --remove-section=.comment], touch)
 AC_CHECK_PROG(STRIP, strip, strip, touch)
+AC_CHECK_PROG(DIFF, gdiff, gdiff, diff)
 AC_CHECK_PROG(UNAME, uname, uname)
 #AC_CHECK_PROG(CCACHE, ccache, ccache)
 AC_CHECK_PROG(DISTCC, distcc, distcc)

configure

@@ -313,7 +313,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP EGREP CCDEPMODE GCC3 SET_MAKE HEAD_1 AWK BASENAME OBJCOPY STRIP UNAME DISTCC CCDEBUG ZLIB LIBOBJS VERSION NUMVER MOD_UPDIR LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP EGREP CCDEPMODE GCC3 SET_MAKE HEAD_1 AWK BASENAME OBJCOPY STRIP DIFF UNAME DISTCC CCDEBUG ZLIB LIBOBJS VERSION NUMVER MOD_UPDIR LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3208,6 +3208,42 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+# Extract the first word of "gdiff", so it can be a program name with args.
+set dummy gdiff; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_DIFF+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$DIFF"; then
+  ac_cv_prog_DIFF="$DIFF" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DIFF="gdiff"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_DIFF" && ac_cv_prog_DIFF="diff"
+fi
+fi
+DIFF=$ac_cv_prog_DIFF
+if test -n "$DIFF"; then
+  echo "$as_me:$LINENO: result: $DIFF" >&5
+echo "${ECHO_T}$DIFF" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
 # Extract the first word of "uname", so it can be a program name with args.
 set dummy uname; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -11245,6 +11281,7 @@ s,@AWK@,$AWK,;t t
 s,@BASENAME@,$BASENAME,;t t
 s,@OBJCOPY@,$OBJCOPY,;t t
 s,@STRIP@,$STRIP,;t t
+s,@DIFF@,$DIFF,;t t
 s,@UNAME@,$UNAME,;t t
 s,@DISTCC@,$DISTCC,;t t
 s,@CCDEBUG@,$CCDEBUG,;t t