Changeset 10216

Timestamp:

03/03/11 12:43:45 (14 years ago)

Author:

tbretz

Message:

Added check for colordiff

Location:

trunk/FACT++

Files:

• Makefile.in (modified) (2 diffs)
• configure (modified) (13 diffs)
• configure.ac (modified) (1 diff)

trunk/FACT++/Makefile.in

@@ -251 +251 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COLORDIFF = @COLORDIFF@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -1502 +1503 @@
 @DX_COND_doc_TRUE@      $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
 
+diff:
+        svn diff | $(COLORDIFF)
+
 # Overwrite rules for silent or other verbosity levels
 # pkg_verbose = $(pkg_verbose_$(V))

trunk/FACT++/configure

@@ -747 +747 @@
 LTLIBOBJS
 LIBOBJS
+COLORDIFF
 BOOST_THREAD_LIB
 BOOST_SYSTEM_LIB
@@ -4249 +4250 @@
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4251: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4252: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4254: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4255: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4257: output\"" >&5)
+  (eval echo "\"\$as_me:4258: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
@@ -5461 +5462 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5463 "configure"' > conftest.$ac_ext
+  echo '#line 5464 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -7389 +7390 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7391: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7392: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7395: \$? = $ac_status" >&5
+   echo "$as_me:7396: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7728 +7729 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7730: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7731: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7734: \$? = $ac_status" >&5
+   echo "$as_me:7735: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -7833 +7834 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7835: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7836: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7839: \$? = $ac_status" >&5
+   echo "$as_me:7840: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -7888 +7889 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7890: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7891: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7894: \$? = $ac_status" >&5
+   echo "$as_me:7895: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10272 +10273 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10274 "configure"
+#line 10275 "configure"
 #include "confdefs.h"
 
@@ -10368 +10369 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10370 "configure"
+#line 10371 "configure"
 #include "confdefs.h"
 
@@ -12324 +12325 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12326: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12327: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12330: \$? = $ac_status" >&5
+   echo "$as_me:12331: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -12423 +12424 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12425: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12426: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12429: \$? = $ac_status" >&5
+   echo "$as_me:12430: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -12475 +12476 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12477: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12478: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12481: \$? = $ac_status" >&5
+   echo "$as_me:12482: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -19971 +19972 @@
 
 
+######################################################################
+# Check if we have colordiff to colorize 'svn diff'
+######################################################################
+
+# Extract the first word of "colordiff", so it can be a program name with args.
+set dummy colordiff; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_COLORDIFF+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$COLORDIFF"; then
+  ac_cv_prog_COLORDIFF="$COLORDIFF" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_COLORDIFF="colordiff"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_COLORDIFF" && ac_cv_prog_COLORDIFF="cat"
+fi
+fi
+COLORDIFF=$ac_cv_prog_COLORDIFF
+if test -n "$COLORDIFF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COLORDIFF" >&5
+$as_echo "$COLORDIFF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
 ###########################################################################
-
 
 #AC_C_CONST

trunk/FACT++/configure.ac

@@ -194 +194 @@
 
 
+######################################################################
+# Check if we have colordiff to colorize 'svn diff'
+######################################################################
+
+AC_CHECK_PROG(COLORDIFF, colordiff, colordiff, cat)
+
 ###########################################################################
-
 
 #AC_C_CONST