Changeset 10216


Ignore:
Timestamp:
Mar 3, 2011, 12:43:45 PM (9 years ago)
Author:
tbretz
Message:
Added check for colordiff
Location:
trunk/FACT++
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/Makefile.in

    r10211 r10216  
    251251CCDEPMODE = @CCDEPMODE@
    252252CFLAGS = @CFLAGS@
     253COLORDIFF = @COLORDIFF@
    253254CPP = @CPP@
    254255CPPFLAGS = @CPPFLAGS@
     
    15021503@DX_COND_doc_TRUE@      $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
    15031504
     1505diff:
     1506        svn diff | $(COLORDIFF)
     1507
    15041508# Overwrite rules for silent or other verbosity levels
    15051509# pkg_verbose = $(pkg_verbose_$(V))
  • trunk/FACT++/configure

    r10211 r10216  
    747747LTLIBOBJS
    748748LIBOBJS
     749COLORDIFF
    749750BOOST_THREAD_LIB
    750751BOOST_SYSTEM_LIB
     
    42494250  lt_cv_nm_interface="BSD nm"
    42504251  echo "int some_variable = 0;" > conftest.$ac_ext
    4251   (eval echo "\"\$as_me:4251: $ac_compile\"" >&5)
     4252  (eval echo "\"\$as_me:4252: $ac_compile\"" >&5)
    42524253  (eval "$ac_compile" 2>conftest.err)
    42534254  cat conftest.err >&5
    4254   (eval echo "\"\$as_me:4254: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
     4255  (eval echo "\"\$as_me:4255: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    42554256  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    42564257  cat conftest.err >&5
    4257   (eval echo "\"\$as_me:4257: output\"" >&5)
     4258  (eval echo "\"\$as_me:4258: output\"" >&5)
    42584259  cat conftest.out >&5
    42594260  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     
    54615462*-*-irix6*)
    54625463  # Find out which ABI we are using.
    5463   echo '#line 5463 "configure"' > conftest.$ac_ext
     5464  echo '#line 5464 "configure"' > conftest.$ac_ext
    54645465  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    54655466  (eval $ac_compile) 2>&5
     
    73897390   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    73907391   -e 's:$: $lt_compiler_flag:'`
    7391    (eval echo "\"\$as_me:7391: $lt_compile\"" >&5)
     7392   (eval echo "\"\$as_me:7392: $lt_compile\"" >&5)
    73927393   (eval "$lt_compile" 2>conftest.err)
    73937394   ac_status=$?
    73947395   cat conftest.err >&5
    7395    echo "$as_me:7395: \$? = $ac_status" >&5
     7396   echo "$as_me:7396: \$? = $ac_status" >&5
    73967397   if (exit $ac_status) && test -s "$ac_outfile"; then
    73977398     # The compiler can only warn and ignore the option if not recognized
     
    77287729   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77297730   -e 's:$: $lt_compiler_flag:'`
    7730    (eval echo "\"\$as_me:7730: $lt_compile\"" >&5)
     7731   (eval echo "\"\$as_me:7731: $lt_compile\"" >&5)
    77317732   (eval "$lt_compile" 2>conftest.err)
    77327733   ac_status=$?
    77337734   cat conftest.err >&5
    7734    echo "$as_me:7734: \$? = $ac_status" >&5
     7735   echo "$as_me:7735: \$? = $ac_status" >&5
    77357736   if (exit $ac_status) && test -s "$ac_outfile"; then
    77367737     # The compiler can only warn and ignore the option if not recognized
     
    78337834   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78347835   -e 's:$: $lt_compiler_flag:'`
    7835    (eval echo "\"\$as_me:7835: $lt_compile\"" >&5)
     7836   (eval echo "\"\$as_me:7836: $lt_compile\"" >&5)
    78367837   (eval "$lt_compile" 2>out/conftest.err)
    78377838   ac_status=$?
    78387839   cat out/conftest.err >&5
    7839    echo "$as_me:7839: \$? = $ac_status" >&5
     7840   echo "$as_me:7840: \$? = $ac_status" >&5
    78407841   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    78417842   then
     
    78887889   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78897890   -e 's:$: $lt_compiler_flag:'`
    7890    (eval echo "\"\$as_me:7890: $lt_compile\"" >&5)
     7891   (eval echo "\"\$as_me:7891: $lt_compile\"" >&5)
    78917892   (eval "$lt_compile" 2>out/conftest.err)
    78927893   ac_status=$?
    78937894   cat out/conftest.err >&5
    7894    echo "$as_me:7894: \$? = $ac_status" >&5
     7895   echo "$as_me:7895: \$? = $ac_status" >&5
    78957896   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    78967897   then
     
    1027210273  lt_status=$lt_dlunknown
    1027310274  cat > conftest.$ac_ext <<_LT_EOF
    10274 #line 10274 "configure"
     10275#line 10275 "configure"
    1027510276#include "confdefs.h"
    1027610277
     
    1036810369  lt_status=$lt_dlunknown
    1036910370  cat > conftest.$ac_ext <<_LT_EOF
    10370 #line 10370 "configure"
     10371#line 10371 "configure"
    1037110372#include "confdefs.h"
    1037210373
     
    1232412325   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1232512326   -e 's:$: $lt_compiler_flag:'`
    12326    (eval echo "\"\$as_me:12326: $lt_compile\"" >&5)
     12327   (eval echo "\"\$as_me:12327: $lt_compile\"" >&5)
    1232712328   (eval "$lt_compile" 2>conftest.err)
    1232812329   ac_status=$?
    1232912330   cat conftest.err >&5
    12330    echo "$as_me:12330: \$? = $ac_status" >&5
     12331   echo "$as_me:12331: \$? = $ac_status" >&5
    1233112332   if (exit $ac_status) && test -s "$ac_outfile"; then
    1233212333     # The compiler can only warn and ignore the option if not recognized
     
    1242312424   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1242412425   -e 's:$: $lt_compiler_flag:'`
    12425    (eval echo "\"\$as_me:12425: $lt_compile\"" >&5)
     12426   (eval echo "\"\$as_me:12426: $lt_compile\"" >&5)
    1242612427   (eval "$lt_compile" 2>out/conftest.err)
    1242712428   ac_status=$?
    1242812429   cat out/conftest.err >&5
    12429    echo "$as_me:12429: \$? = $ac_status" >&5
     12430   echo "$as_me:12430: \$? = $ac_status" >&5
    1243012431   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1243112432   then
     
    1247512476   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1247612477   -e 's:$: $lt_compiler_flag:'`
    12477    (eval echo "\"\$as_me:12477: $lt_compile\"" >&5)
     12478   (eval echo "\"\$as_me:12478: $lt_compile\"" >&5)
    1247812479   (eval "$lt_compile" 2>out/conftest.err)
    1247912480   ac_status=$?
    1248012481   cat out/conftest.err >&5
    12481    echo "$as_me:12481: \$? = $ac_status" >&5
     12482   echo "$as_me:12482: \$? = $ac_status" >&5
    1248212483   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1248312484   then
     
    1997119972
    1997219973
     19974######################################################################
     19975# Check if we have colordiff to colorize 'svn diff'
     19976######################################################################
     19977
     19978# Extract the first word of "colordiff", so it can be a program name with args.
     19979set dummy colordiff; ac_word=$2
     19980{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     19981$as_echo_n "checking for $ac_word... " >&6; }
     19982if test "${ac_cv_prog_COLORDIFF+set}" = set; then :
     19983  $as_echo_n "(cached) " >&6
     19984else
     19985  if test -n "$COLORDIFF"; then
     19986  ac_cv_prog_COLORDIFF="$COLORDIFF" # Let the user override the test.
     19987else
     19988as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     19989for as_dir in $PATH
     19990do
     19991  IFS=$as_save_IFS
     19992  test -z "$as_dir" && as_dir=.
     19993    for ac_exec_ext in '' $ac_executable_extensions; do
     19994  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     19995    ac_cv_prog_COLORDIFF="colordiff"
     19996    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     19997    break 2
     19998  fi
     19999done
     20000  done
     20001IFS=$as_save_IFS
     20002
     20003  test -z "$ac_cv_prog_COLORDIFF" && ac_cv_prog_COLORDIFF="cat"
     20004fi
     20005fi
     20006COLORDIFF=$ac_cv_prog_COLORDIFF
     20007if test -n "$COLORDIFF"; then
     20008  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COLORDIFF" >&5
     20009$as_echo "$COLORDIFF" >&6; }
     20010else
     20011  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     20012$as_echo "no" >&6; }
     20013fi
     20014
     20015
     20016
    1997320017###########################################################################
    19974 
    1997520018
    1997620019#AC_C_CONST
  • trunk/FACT++/configure.ac

    r10211 r10216  
    194194
    195195
     196######################################################################
     197# Check if we have colordiff to colorize 'svn diff'
     198######################################################################
     199
     200AC_CHECK_PROG(COLORDIFF, colordiff, colordiff, cat)
     201
    196202###########################################################################
    197 
    198203
    199204#AC_C_CONST
Note: See TracChangeset for help on using the changeset viewer.