diff options
| author | Jean Delvare <khali@linux-fr.org> | 2006-03-25 13:49:24 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2006-03-25 13:49:24 +0000 |
| commit | fa45df17d6f6cf77f40c01196fe65eaa25be32a8 (patch) | |
| tree | d876081d109476705441a9104bbcc96db746c4f6 | |
| parent | 89ecf7e2648113efec3389e4dc3361d04bb45369 (diff) | |
| download | quilt-fa45df17d6f6cf77f40c01196fe65eaa25be32a8.tar.gz | |
- Makefile.in: configure depends on aclocal.m4 too.
- configure.ac: Cleanup two QUILT_COMPAT_PROG_PATH calls, the
second parameter is not supposed to be a list.
- aclocal.m4: Document the fourth (optional) parameter of
QUILT_COMPAT_PROG_PATH.
- aclocal.m4: No need to check for binaries we were told not to
use.
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | aclocal.m4 | 5 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | quilt.changes | 11 |
4 files changed, 18 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 59a4dd5..d299852 100644 --- a/Makefile.in +++ b/Makefile.in @@ -262,7 +262,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in quilt/*.in quilt/scripts/*.in)) :: Makefil lib/backup-files.o :: Makefile -configure : configure.ac +configure : configure.ac aclocal.m4 autoconf @echo "Please run ./configure" @false @@ -1,7 +1,8 @@ dnl Allow configure to specify a specific binary dnl 1: Environment variable dnl 2: binary name -dnl 3: optional list of alternatives +dnl 3: optional list of alternative binary names +dnl 4: optional list of additional search directories AC_DEFUN([QUILT_COMPAT_PROG_PATH],[ m4_define([internal_$2_cmd],[esyscmd(ls compat/$2.in 2>/dev/null)]) @@ -13,8 +14,8 @@ AC_DEFUN([QUILT_COMPAT_PROG_PATH],[ if test x"$withval" = xnone; then AC_MSG_ERROR([Invalid configure argument. use --without-$2]) fi - AC_MSG_CHECKING(for $2) if test x"$withval" != xno; then + AC_MSG_CHECKING(for $2) $1="$withval" if test -e "$$1"; then if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then diff --git a/configure.ac b/configure.ac index ab85b82..d5e972f 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.44],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) -AC_REVISION ($Revision: 1.76 $) +AC_REVISION ($Revision: 1.77 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) @@ -284,7 +284,7 @@ does understand -path, you can supply its path with the ]) fi -QUILT_COMPAT_PROG_PATH(DIFFSTAT, [diffstat]) +QUILT_COMPAT_PROG_PATH(DIFFSTAT, diffstat) if test -z "$INTERNAL_DIFFSTAT"; then # We need diffstat version 1.32 or better, else quilt refresh --diffstat @@ -315,7 +315,7 @@ will not work correctly until a newer version (>= 1.32) is installed. fi fi -QUILT_COMPAT_PROG_PATH(SENDMAIL, [sendmail], [], [/usr/sbin]) +QUILT_COMPAT_PROG_PATH(SENDMAIL, sendmail, [], [/usr/sbin]) AC_PATH_PROG(MSGMERGE, [msgmerge]) AC_PATH_PROG(MSGFMT, [msgfmt]) diff --git a/quilt.changes b/quilt.changes index 8c82267..723604d 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Sat Mar 25 14:45:09 CET 2006 - khali@linux-fr.org + +- Makefile.in: configure depends on aclocal.m4 too. +- configure.ac: Cleanup two QUILT_COMPAT_PROG_PATH calls, the + second parameter is not supposed to be a list. +- aclocal.m4: Document the fourth (optional) parameter of + QUILT_COMPAT_PROG_PATH. +- aclocal.m4: No need to check for binaries we were told not to + use. + +------------------------------------------------------------------- Tue Mar 21 16:47:57 CET 2006 - agruen@suse.de - quilt/edit.in: The last fix broke another way of using edit. |