diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2005-09-19 14:07:02 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2005-09-19 14:07:02 +0000 |
commit | 889234847e66a3d15c2a2353af911c128cabe2dc (patch) | |
tree | 8631005258c9e19ed679b713440aa14d55926c4e | |
parent | 097df6ce558b8bd14dd3beeea183033c4cec0fe5 (diff) | |
download | quilt-889234847e66a3d15c2a2353af911c128cabe2dc.tar.gz |
- Use compatibility m4 for diffstat. Correctly diagnose older
diffstat on OS X 10.3, which outputs '1.2 (patch 5)'. Update
configure warning message to reflect reality that quilt diff
does not accept --diffstat (John Vandenberg <jayvdb@gmail.com>).
-rw-r--r-- | compat/diffstat.in | 4 | ||||
-rw-r--r-- | configure.ac | 34 | ||||
-rw-r--r-- | quilt.changes | 8 |
3 files changed, 22 insertions, 24 deletions
diff --git a/compat/diffstat.in b/compat/diffstat.in new file mode 100644 index 0000000..f194ccf --- /dev/null +++ b/compat/diffstat.in @@ -0,0 +1,4 @@ +#! @BASH@ + +echo "diffstat support has not been built into \`quilt'" >&2 +exit 1 diff --git a/configure.ac b/configure.ac index 6c9db6a..ce91341 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([quilt],[0.42],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) -AC_REVISION ($Revision: 1.55 $) +AC_REVISION ($Revision: 1.56 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) @@ -142,38 +142,24 @@ else AC_MSG_RESULT(yes) fi -AC_ARG_WITH(diffstat, AC_HELP_STRING( - [--with-diffstat], [name of the diffstat executable to use]), - [ - DIFFSTAT="$withval" - AC_SUBST(DIFFSTAT) - AC_MSG_NOTICE([Using diffstat executable $DIFFSTAT]) - ],[ - AC_PATH_PROG(DIFFSTAT, diffstat) - ]) -if test -z "$DIFFSTAT"; then - AC_MSG_WARN([ -diffstat utility not found; the --diffstat option of the refresh command -will not work correctly until diffstat is installed. If you have diffstat -in a directory that is not in the search path you can specify its location -using the '--with-diffstat' option. -]) - DIFFSTAT="diffstat" -elif test "$DIFFSTAT" != no; then +QUILT_COMPAT_PROG_PATH(DIFFSTAT, [diffstat]) + +if test -z "$INTERNAL_DIFFSTAT"; then # We need diffstat version 1.32 or better, else quilt refresh --diffstat # will show progress data we don't want to see. This is only a warning # and we continue even if version is older, as this is only a minor # annoyance. AC_MSG_CHECKING([for diffstat version]) - diffstat_major_version=`$DIFFSTAT -V 2>/dev/null | \ - sed 's/^[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - diffstat_minor_version=`$DIFFSTAT -V 2>/dev/null | \ - sed 's/^[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` + diffstat_version=`$DIFFSTAT -V 2>/dev/null | \ + sed 's/^[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\).*/\1 \2/'` + eval set -- "$diffstat_version" + diffstat_major_version="$1" + diffstat_minor_version="$2" if test -z "$diffstat_major_version" -o -z "$diffstat_minor_version"; then AC_MSG_RESULT(unknown) AC_MSG_WARN([ diffstat utility version couldn't be checked; chances are good that the ---diffstat option of the refresh and diff commands will not work properly. +--diffstat option of the refresh command will not work properly. ]) else AC_MSG_RESULT($diffstat_major_version.$diffstat_minor_version) diff --git a/quilt.changes b/quilt.changes index e017cb3..2f5ebae 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Sep 19 16:05:14 CEST 2005 - agruen@suse.de + +- Use compatibility m4 for diffstat. Correctly diagnose older + diffstat on OS X 10.3, which outputs '1.2 (patch 5)'. Update + configure warning message to reflect reality that quilt diff + does not accept --diffstat (John Vandenberg <jayvdb@gmail.com>). + +------------------------------------------------------------------- Mon Sep 19 15:54:01 CEST 2005 - agruen@suse.de - quilt/mail.in: add a --sender option for specifying the envelope |