diff options
| -rw-r--r-- | Makefile.in | 18 | ||||
| -rw-r--r-- | aclocal.m4 | 18 | ||||
| -rw-r--r-- | compat/sendmail.in (renamed from compat/mta.in) | 0 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | quilt.changes | 9 | ||||
| -rw-r--r-- | quilt/mail.in | 4 |
6 files changed, 42 insertions, 23 deletions
diff --git a/Makefile.in b/Makefile.in index a653e7f..6c69530 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,7 +33,7 @@ MKTEMP := @MKTEMP@ MSGFMT := @MSGFMT@ DIFFSTAT := @DIFFSTAT@ RPMBUILD := @RPMBUILD@ -MTA := @MTA@ +SENDMAIL := @SENDMAIL@ COMPAT_SYMLINKS := @COMPAT_SYMLINKS@ COMPAT_PROGRAMS := @COMPAT_PROGRAMS@ @@ -121,7 +121,11 @@ SRC += changes2changelog #----------------------------------------------------------------------- -all : scripts $(COMPAT_PROGRAMS:%=compat/%) $(if $(MSGFMT),$(LINGUAS:%=po/%.mo)) +all : scripts compat-programs $(if $(MSGFMT),$(LINGUAS:%=po/%.mo)) + +.PHONY :: compat-programs +compat-programs : $(COMPAT_PROGRAMS:%=compat/%) + chmod +x $+ $(LIB:%=lib/%) : $(LIB_SRC:%.c=lib/%.o) $(CC) -o $@ $(LDFLAGS) $^ $(LIBS) @@ -172,9 +176,10 @@ doc/README : doc/README.in $(QUILT:%=quilt/%) esac ; \ done 2>&1 < $< > $@ -doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) +doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) compat-programs @echo "quilt.1.in -> quilt.1" - @here=`pwd`; \ + @export PATH="`pwd`/compat:$$PATH"; \ + here=`pwd`; \ while read line; do \ case "$$line" in \ '@REFERENCE''@') \ @@ -201,8 +206,9 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) done 2>&1 < $< > $@ .PHONY :: reference -reference : $(QUILT:%=quilt/%) scripts/patchfns - @dir=$(CURDIR); \ +reference : $(QUILT:%=quilt/%) compat-programs scripts/patchfns + @export PATH="`pwd`/compat:$$PATH"; \ + dir=$(CURDIR); \ for i in $(filter-out scripts/patchfns,$+); \ do \ echo; \ @@ -16,7 +16,23 @@ AC_DEFUN([QUILT_COMPAT_PROG_PATH],[ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" fi ],[ - AC_PATH_PROG($1, m4_if([$3],[],[$2],[$3])) + m4_if([$3],[],[ + AC_PATH_PROGS($1,$2,,$PATH:$4) + ],[ + AC_PATH_PROG($1,$3,,$PATH:$4) + ]) + m4_if([$4],[],[],[ + if test -n "$$1"; then + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for dir in "$4"; do + if test "`dirname $$1`" = "$dir"; then + COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" + break + fi + done + IFS="$as_save_IFS" + fi + ]) ]) if test -z "$$1"; then m4_if(internal_$2_cmd,[],[ diff --git a/compat/mta.in b/compat/sendmail.in index b4fe28d..b4fe28d 100644 --- a/compat/mta.in +++ b/compat/sendmail.in diff --git a/configure.ac b/configure.ac index c74c5e8..6c9db6a 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.54 $) +AC_REVISION ($Revision: 1.55 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) @@ -187,19 +187,7 @@ will not work correctly until a newer version (>= 1.32) is installed. fi fi -dnl Check for sendmail -old_PATH=$PATH -PATH="$PATH:/usr/sbin" -QUILT_COMPAT_PROG_PATH(MTA, mta, [sendmail]) -PATH=$old_PATH - -if test -n "$MTA" ; then - COMPAT_SYMLINKS="$COMPAT_SYMLINKS mta" -else - if ! echo $COMPAT_PROGRAMS $COMPAT_SYMLINKS | grep -q mta; then - COMPAT_PROGRAMS="$COMPAT_PROGRAMS mta" - fi -fi +QUILT_COMPAT_PROG_PATH(SENDMAIL, [sendmail], [], [/usr/sbin]) AC_ARG_ENABLE(nls, AC_HELP_STRING( [--enable-nls], [include natural language support])) diff --git a/quilt.changes b/quilt.changes index 168f8de..3b10c77 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Sep 19 15:23:54 CEST 2005 - agruen@suse.de + +- Rename MTA program to SENDMAIL, and improve configure.ac + (from John Vandenberg again, as several other recent things -- + thanks!) +- Must build the compatibility programs before creating the + command reference (which extracts the help texts). + +------------------------------------------------------------------- Mon Sep 19 12:25:15 CEST 2005 - agruen@suse.de - Fix mta check when sendmail is found. diff --git a/quilt/mail.in b/quilt/mail.in index 3530acb..d0745bf 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -66,10 +66,10 @@ process_mail() --extract-recipients Bcc \ < $tmpfile) if [ -n "$opt_send" ]; then - echo mta "$@" + echo sendmail "$@" @SCRIPTS@/edmail --charset $opt_charset \ --remove-header Bcc "$@" < $tmpfile \ - | mta "$@" + | sendmail "$@" else local from_date=$(date "+%a %b %e %H:%M:%S %Y") echo "From ${LOGNAME:-$(whoami)}@$(hostname -f) $from_date" |