Commit 2a06c2d3 authored by Ondrej Sury's avatar Ondrej Sury

New upstream version 0.75.0

parent 7c86a158
This diff is collapsed.
......@@ -132,14 +132,19 @@ Table Of Contents
Upgrading an existing installation
Upgrading from the Courier mail server 0.72, or higher
Upgrading from the Courier mail server 0.73.1, or earlier
The unicode library in Courier is now a separate package. Download the
Courier Unicode Library before updating to 0.74, or later.
Upgrading from the Courier mail server 0.72, or earlier
Version 0.73 removes the TLS_DHCERTFILE parameter from esmtpd, esmtpd-ssl,
imap, and pop3d configuration files. DH parameters, and DH parameters
only, get read from the new TLS_DHPARAMS file (and the other functionaly
of TLS_DHCERTFILE, for DSA certificates, is merged into TLS_CERTFILE). The
default startup script in the package is updated to run the new mkdhparams
script, that creates a new TLS_DHPARAMS file.
of TLS_DHCERTFILE, for DSA certificates, is merged into TLS_CERTFILE).
After upgrading, run the mkdhparams script to create a new TLS_DHPARAMS
file.
Upgrading from the Courier mail server 0.66.3, or earlier
......@@ -432,13 +437,19 @@ Overview
You will need the following software in order to compile and install the
Courier mail server:
 1. The Courier mail server Authentication Library
 1. The Courier Unicode Library
The courier-unicode package must be installed and configured prior to
installing the Courier mail server. Download the courier-unicode
package from http://www.courier-mta.org/unicode/.
 2. The Courier mail server Authentication Library
The courier-authlib package must be installed and configured prior to
installing the Courier mail server. Download the courier-authlib
package from http://www.courier-mta.org/authlib/.
 2. A C++ compiler
 3. A C++ compiler
The Courier mail server is primarily developed and built with gcc.
Other C++ compiler may or may not work. Solaris's C++ compiler is
......@@ -447,30 +458,30 @@ Overview
header files. IBM has released a GNU/Linux development toolkit for
AIX, which may help in getting the Courier mail server to compile.
 3. PCRE
 4. PCRE
The PCRE library (http:/www.pcre.org) is required.
 4. GNU IDN library
 5. GNU IDN library
This library (http://www.gnu.org/software/libidn/) implements support
for internationalized domain names.
 5. GNU make
 6. GNU make
On the BSD platform family GNU make is usually installed as gmake.
Simply replace 'make' with 'gmake' in the following instructions. GNU
make is REQUIRED. Use anything else at your own risk.
 6. Perl 5
 7. Perl 5
A recent version of Perl needs to be installed.
 7. GDBM or Berkeley DB library
 8. GDBM or Berkeley DB library
Either library must be installed.
 8. FAM, the File Alteration Monitor, or its modern Linux-specific
 9. FAM, the File Alteration Monitor, or its modern Linux-specific
replacement Gamin
FAM (http://oss.sgi.com/projects/fam/) or Gamin is optional. If FAM or
......@@ -478,12 +489,12 @@ Overview
implementation that provides real-time folder status updates to
concurrent IMAP clients that have the same folder opened.
 9. OpenSSL or GnuTLS
10. OpenSSL or GnuTLS
Support for SSL/TLS requires OpenSSL/GnuTLS. If OpenSSL or GnuTLS is
not installed, SSL/TLS features are disabled.
10. OpenLDAP
11. OpenLDAP
Support for LDAP directory services requires OpenLDAP client libraries
to be installed. If OpenLDAP is not installed LDAP directory features
......@@ -503,7 +514,7 @@ Overview
OpenLDAP client libraries must be installed. If OpenLDAP is not
installed, LDAP directory features are disabled.
11. mgetty+sendfax, groff or troff (not tested), ghostscript, and NetPBM
12. mgetty+sendfax, groff or troff (not tested), ghostscript, and NetPBM
This optional software is required to send E-mail messages via fax.
The Courier mail server will compile and install without this
......@@ -1021,6 +1032,16 @@ Run configure
a convenient option to have the Courier mail server use an external,
previously installed, root CA database.
* --with-certsdir=pathname
Set up configuration files and scripts that reference the server's SSL
certificates to use the pathname directory, instead of the directory
specified by the --datadir option. Scripts that create temporary
self-signed certificates to be used for testing (mkimapdcert,
mkpop3dcert, et. al.) install the generated certificate in this
directory, and it's referenced from the corresponding configuration
files.
* --with-waitfunc=wait, --with-waitfunc=wait3
Specify the system call to use to asynchronously reap child processes.
......@@ -1403,8 +1424,9 @@ Post-installation setup
up the cron job. Run the su command as root, to make sure that its
syntax is correct, before setting up the cron job. The cron job can be
omitted if webmail is not going to be used.
* A monthly job should be created to run the mkdhparams script, in order
to periodically generate a new set of DH parameters. DH parameters are
* Run the mkdhparams script to create the DH parameter file. A monthly
job should also be created to run the mkdhparams script, in order to
periodically generate a new set of DH parameters. DH parameters are
used to set up encrypted connections.
Post-installation checks
......@@ -3745,12 +3767,11 @@ Sample init script
echo -n "Starting the Courier mail server:"
# Only if it doesn't exist, let the cron job take care of refreshing it.
# Use default DH parameter file, if it does not exist.
if test ! -f ${datadir}/dhparams.pem
then
${sbindir}/mkdhparams
echo -n " dhparams"
ln ${datadir}/dhparams.pem.dist ${datadir}/dhparams.pem
fi
# First time after install create aliases.dat and makesmtpaccess.dat
......
......@@ -7,14 +7,14 @@
AUTOMAKE_OPTIONS=dist-bzip2
SUBDIRS=afx @DBSUBDIR@ libs/numlib libs/soxwrap libs/md5 libs/sha1 \
libs/libhmac libs/random128 libs/unicode libs/rfc822 libs/rfc1035 \
libs/libhmac libs/random128 libs/rfc822 libs/rfc1035 \
libs/rfc2045 libs/liblock libs/maildir libs/waitlib libs/tcpd \
libs/threadlib libs/makedat libs/rootcerts libs/imap libs/maildrop \
libs/cgi libs/http11 libs/ldapaddressbook libs/gpglib libs/pcp \
libs/sqwebmail webadmin courier
DIST_SUBDIRS=afx libs/gdbmobj libs/bdbobj libs/numlib libs/soxwrap \
libs/md5 libs/sha1 libs/libhmac libs/random128 libs/unicode \
libs/md5 libs/sha1 libs/libhmac libs/random128 \
libs/rfc822 libs/rfc1035 libs/rfc2045 libs/liblock libs/maildir \
libs/waitlib libs/tcpd libs/threadlib libs/makedat libs/rootcerts \
libs/imap libs/maildrop libs/cgi libs/http11 libs/ldapaddressbook \
......@@ -82,8 +82,8 @@ all-gmake-check:
dist-hook:
test -f $(srcdir)/rpm.release && cp $(srcdir)/rpm.release $(distdir) ; \
exit 0
$(MAKE) -$(MAKEFLAGS) courier.spec courier.lpspec
cp courier.spec courier.lpspec $(distdir)
$(MAKE) -$(MAKEFLAGS) courier.spec
cp courier.spec $(distdir)
release: dist
......@@ -92,8 +92,8 @@ distrelease:
$(MAKE) rpm
$(MAKE)
$(MAKE)
rm -f INSTALL courier.spec courier.lpspec
$(MAKE) INSTALL courier.spec courier.lpspec
rm -f INSTALL courier.spec
$(MAKE) INSTALL courier.spec
$(MAKE) dist
rpm: rpm-build
......@@ -152,7 +152,7 @@ dorpm:
--define '__spec_prep_pre %{___build_pre}' \
$(RPMFLAGS) @PACKAGE@-@VERSION@.tar.bz2
bump.rpm.release: courier.spec courier.lpspec
bump.rpm.release: courier.spec
VERSION="x"; \
test -f $(srcdir)/rpm.release && . $(srcdir)/rpm.release; \
NEXT_RELEASE=0; \
......@@ -162,11 +162,7 @@ bump.rpm.release: courier.spec courier.lpspec
echo "RELEASE=$$RELEASE" >>$(srcdir)/rpm.release; \
sed 's/^Release: .*/Release: '$$RELEASE'%{?dist}%{courier_release}/' \
<courier.spec >courier.spec.new; \
mv courier.spec.new courier.spec; \
sed 's/^Release: .*/Release: '$$RELEASE'/' \
<courier.lpspec >courier.lpspec.new; \
mv courier.lpspec.new courier.lpspec
mv courier.spec.new courier.spec
install-configure:
@$(MAKE) install-perms
......
# Makefile.in generated by automake 1.13.4 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -18,7 +18,17 @@
# Copyright 1998 - 2009 Double Precision, Inc. See COPYING for
# distribution information.
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -82,23 +92,17 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/courier.spec.in $(srcdir)/courier.lpspec.in \
$(srcdir)/courier.service.in $(srcdir)/dbobj.h.in \
$(srcdir)/dbobj.config.in $(srcdir)/courier.sysvinit.in \
COPYING TODO config.guess config.rpath config.sub depcomp \
install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES = courier.spec courier.lpspec courier.service \
dbobj.h dbobj.config courier.sysvinit
CONFIG_CLEAN_FILES = courier.spec courier.service dbobj.h dbobj.config \
courier.sysvinit
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
......@@ -155,6 +159,11 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/courier.service.in \
$(srcdir)/courier.spec.in $(srcdir)/courier.sysvinit.in \
$(srcdir)/dbobj.config.in $(srcdir)/dbobj.h.in AUTHORS COPYING \
ChangeLog INSTALL NEWS README TODO compile config.guess \
config.rpath config.sub depcomp install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -335,14 +344,14 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = dist-bzip2
SUBDIRS = afx @DBSUBDIR@ libs/numlib libs/soxwrap libs/md5 libs/sha1 \
libs/libhmac libs/random128 libs/unicode libs/rfc822 libs/rfc1035 \
libs/libhmac libs/random128 libs/rfc822 libs/rfc1035 \
libs/rfc2045 libs/liblock libs/maildir libs/waitlib libs/tcpd \
libs/threadlib libs/makedat libs/rootcerts libs/imap libs/maildrop \
libs/cgi libs/http11 libs/ldapaddressbook libs/gpglib libs/pcp \
libs/sqwebmail webadmin courier
DIST_SUBDIRS = afx libs/gdbmobj libs/bdbobj libs/numlib libs/soxwrap \
libs/md5 libs/sha1 libs/libhmac libs/random128 libs/unicode \
libs/md5 libs/sha1 libs/libhmac libs/random128 \
libs/rfc822 libs/rfc1035 libs/rfc2045 libs/liblock libs/maildir \
libs/waitlib libs/tcpd libs/threadlib libs/makedat libs/rootcerts \
libs/imap libs/maildrop libs/cgi libs/http11 libs/ldapaddressbook \
......@@ -371,7 +380,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -392,8 +400,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
courier.spec: $(top_builddir)/config.status $(srcdir)/courier.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
courier.lpspec: $(top_builddir)/config.status $(srcdir)/courier.lpspec.in
cd $(top_builddir) && $(SHELL) ./config.status $@
courier.service: $(top_builddir)/config.status $(srcdir)/courier.service.in
cd $(top_builddir) && $(SHELL) ./config.status $@
dbobj.h: $(top_builddir)/config.status $(srcdir)/dbobj.h.in
......@@ -601,10 +607,16 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
......@@ -639,16 +651,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
&& $(am__cd) $(distdir)/_build/sub \
&& ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
......@@ -826,6 +839,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
.PRECIOUS: Makefile
@SET_MAKE@
......@@ -883,8 +898,8 @@ all-gmake-check:
dist-hook:
test -f $(srcdir)/rpm.release && cp $(srcdir)/rpm.release $(distdir) ; \
exit 0
$(MAKE) -$(MAKEFLAGS) courier.spec courier.lpspec
cp courier.spec courier.lpspec $(distdir)
$(MAKE) -$(MAKEFLAGS) courier.spec
cp courier.spec $(distdir)
release: dist
......@@ -893,8 +908,8 @@ distrelease:
$(MAKE) rpm
$(MAKE)
$(MAKE)
rm -f INSTALL courier.spec courier.lpspec
$(MAKE) INSTALL courier.spec courier.lpspec
rm -f INSTALL courier.spec
$(MAKE) INSTALL courier.spec
$(MAKE) dist
rpm: rpm-build
......@@ -952,7 +967,7 @@ dorpm:
--define '__spec_prep_pre %{___build_pre}' \
$(RPMFLAGS) @PACKAGE@-@VERSION@.tar.bz2
bump.rpm.release: courier.spec courier.lpspec
bump.rpm.release: courier.spec
VERSION="x"; \
test -f $(srcdir)/rpm.release && . $(srcdir)/rpm.release; \
NEXT_RELEASE=0; \
......@@ -962,10 +977,7 @@ bump.rpm.release: courier.spec courier.lpspec
echo "RELEASE=$$RELEASE" >>$(srcdir)/rpm.release; \
sed 's/^Release: .*/Release: '$$RELEASE'%{?dist}%{courier_release}/' \
<courier.spec >courier.spec.new; \
mv courier.spec.new courier.spec; \
sed 's/^Release: .*/Release: '$$RELEASE'/' \
<courier.lpspec >courier.lpspec.new; \
mv courier.lpspec.new courier.lpspec
mv courier.spec.new courier.spec
install-configure:
@$(MAKE) install-perms
......
This diff is collapsed.
# Makefile.in generated by automake 1.13.4 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -20,7 +20,17 @@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -83,14 +93,12 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
noinst_PROGRAMS = testafxpipe$(EXEEXT)
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in $(top_srcdir)/../depcomp ChangeLog \
$(top_srcdir)/../install-sh $(top_srcdir)/../missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
......@@ -183,6 +191,9 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
AM_RECURSIVE_TARGETS = cscope
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/../compile $(top_srcdir)/../depcomp \
$(top_srcdir)/../install-sh $(top_srcdir)/../missing ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -319,7 +330,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -340,8 +350,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
@if test ! -f $@; then rm -f stamp-h1; else :; fi
@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
@test -f $@ || rm -f stamp-h1
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
......@@ -507,10 +517,16 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
......@@ -545,16 +561,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
&& $(am__cd) $(distdir)/_build/sub \
&& ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
......@@ -732,6 +749,8 @@ uninstall-am:
mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
ps ps-am tags tags-am uninstall uninstall-am
.PRECIOUS: Makefile
check-am:
./testafxpipe <libafx.a | cmp - libafx.a
......
This diff is collapsed.
......@@ -2253,7 +2253,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
am__api_version='1.13'
am__api_version='1.15'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
......@@ -2454,8 +2454,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
# Expand $ac_aux_dir to an absolute path.
am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
......@@ -2474,7 +2474,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
......@@ -2793,8 +2793,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>