[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Mailutils branch, master, updated. release-2.2-713-ga551d48
|
From: |
Sergey Poznyakoff |
|
Subject: |
[SCM] GNU Mailutils branch, master, updated. release-2.2-713-ga551d48 |
|
Date: |
Sat, 27 Jun 2015 06:07:40 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".
http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=a551d489683e8b3a2849580f1672825a611927c9
The branch, master has been updated
via a551d489683e8b3a2849580f1672825a611927c9 (commit)
via 5d5dedd067f782b081895f1e9c2b401db64e7c58 (commit)
via ac65e9fdde146bef1c946262747061885688c055 (commit)
via fb16f4dff202b1b0033386c6d2e0169ab35b9103 (commit)
via 30bc0edd27e8d5eb6fa49aa26624c1dfb7cb2f38 (commit)
via a41e62b9eb33c46ec0897c6c956057d8b797883d (commit)
from f572e5ac7cbcbc8cdf2bdaef9a873f63ec6b6e6f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a551d489683e8b3a2849580f1672825a611927c9
Author: Sergey Poznyakoff <address@hidden>
Date: Sat Jun 27 08:40:16 2015 +0300
Fix double-inclusion of config.h in some sources
* lib/muscript.h: Don't include config.h: the caller is responsible
for that.
* lib/guile.c: Include config.h
* lib/python.c: Likewise.
* lib/script.c: Likewise.
* lib/sieve.c: Likewise.
commit 5d5dedd067f782b081895f1e9c2b401db64e7c58
Author: Sergey Poznyakoff <address@hidden>
Date: Fri Jun 26 15:42:24 2015 +0300
Minor fix
* mh/prompter-tty.c: include signal.h
commit ac65e9fdde146bef1c946262747061885688c055
Author: Sergey Poznyakoff <address@hidden>
Date: Fri Jun 26 13:56:37 2015 +0300
Fix segfault when destroying mu_body_t under certain conditions
That's a temporary solution until reference counters are implemented
for mu_body_t
* libmailutils/mailbox/body.c (bstr_close, bstr_done): Don't close
streams.
commit fb16f4dff202b1b0033386c6d2e0169ab35b9103
Author: Sergey Poznyakoff <address@hidden>
Date: Fri Jun 26 10:50:31 2015 +0300
Bigfixes.
* configure.ac: Fix checks for readline. If it is
not present - bail out if it was explicitly requested
and silently disable it otherwise.
Check for dbm_dirfno and dbm_pagfno (see libmu_dbm/ndbm.c,
below).
* examples/mboxidx.c (set_charset_filter): Fix array dimensions.
* lib/python.c (python_done): add missing return statement.
* libmailutils/address/address.c (mu_address_union): Fix size
argument to memset.
* libmailutils/server/msrv.c (mu_m_server_get_hints): Likewise.
* libmu_compat/vartab.c (vardefn_free): Likewise.
* libmailutils/cfg/parser.y (_set_fun): cast enum to size_t before
comparison
* libmailutils/diag/wd.c (mu_wd): fix while loop.
* libmailutils/tests/url-parse.c (main): Fix printf format.
* libmu_dbm/ndbm.c (_ndbm_get_fd): One of dbm_dirfno or
dbm_pagfno may be missing (on FreeBSD, dbm_pagfno expands
to a non-defined macro, which produces compilation error.
* mail/mailvar.c (mailvar_varptr_comp): Remove.
(mailvar_list_copy): Use mailvar_variable_comp instead
of the removed mailvar_varptr_comp.
commit 30bc0edd27e8d5eb6fa49aa26624c1dfb7cb2f38
Author: Sergey Poznyakoff <address@hidden>
Date: Wed Jun 24 11:56:04 2015 +0300
Add gnulib as a module
commit a41e62b9eb33c46ec0897c6c956057d8b797883d
Author: Sergey Poznyakoff <address@hidden>
Date: Wed Jun 24 10:05:50 2015 +0300
Make libmuaux installable shared library.
This commit converts libmuaux into installable shared library that
includes selected modules from gnulib. Correspondingly,
lubmu_argp is also converted into installable shared library, which
is the main purpose of these changes. This should allow other packages
which depend on Mailutils to link against libmu_argp even on systems
that for some reason choose not to include static libraries in their
distribution (vide Debian). Another side effect is that such packages
won't need to bother about argp being present on the system, as it is
now included in libmuaux.so.
* bootstrap.conf: Don't create Makefile.am
Build gnulib using libtool and use mu_am_flags custom module
* lib/local/modules/mu_am_flags: New file.
* configure.ac (MU_APP_LIBRARIES): Use libmu_argp.la
(TCPWRAP_LIBRARIES): Add libmutcpwrap.a
* lib/Makefile.am: Make libmuaux installable shared library
New static library libmutcpwrap.a
* libmu_argp/Makefile.am: Make libmu_argp installable shared library
* examples/Makefile.am: Use libmu_argp.la
* examples/cpp/Makefile.am: Likewise.
* imap4d/Makefile.am: Likewise.
* mapi/Makefile.am: Likewise.
* mh/Makefile.am: Likewise,
* pop3d/Makefile.am: Likewise.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 -
.gitmodules | 3 +
README-hacking | 1 -
bootstrap | 1055 ++++++++++++++++++++++++++--------------
bootstrap.conf | 14 +-
configure.ac | 41 +-
examples/Makefile.am | 12 +-
examples/cpp/Makefile.am | 4 +-
examples/mboxidx.c | 2 +-
gnulib | 1 +
imap4d/Makefile.am | 2 +-
lib/Makefile.am | 12 +-
lib/guile.c | 3 +
lib/local/modules/mu_am_flags | 14 +
lib/muscript.h | 3 -
lib/python.c | 6 +-
lib/script.c | 3 +
lib/sieve.c | 3 +
libmailutils/address/address.c | 2 +-
libmailutils/cfg/parser.y | 2 +-
libmailutils/diag/wd.c | 2 +-
libmailutils/mailbox/body.c | 11 +
libmailutils/server/msrv.c | 2 +-
libmailutils/tests/url-parse.c | 2 +-
libmu_argp/Makefile.am | 5 +-
libmu_compat/vartab.c | 2 +-
libmu_dbm/ndbm.c | 18 +
mail/mailvar.c | 11 +-
mapi/Makefile.am | 2 +-
mh/Makefile.am | 4 +-
mh/prompter-tty.c | 1 +
pop3d/Makefile.am | 2 +-
32 files changed, 820 insertions(+), 426 deletions(-)
create mode 160000 gnulib
create mode 100644 lib/local/modules/mu_am_flags
diff --git a/.gitignore b/.gitignore
index a1b6218..01dc001 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,6 @@ configure
core
git-describe
git-describe.h
-gnulib
libtool
m4
mailutils*.tar.*
diff --git a/.gitmodules b/.gitmodules
index f3199f7..bdc2cb0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
[submodule "doc/imprimatur"]
path = doc/imprimatur
url = git://git.gnu.org.ua/imprimatur.git
+[submodule "gnulib"]
+ path = gnulib
+ url = git://git.sv.gnu.org/gnulib.git
diff --git a/README-hacking b/README-hacking
index 22de03c..0cd240e 100644
--- a/README-hacking
+++ b/README-hacking
@@ -15,7 +15,6 @@ version.
- M4 <http://www.gnu.org/software/m4/>
- Texinfo <http://www.gnu.org/software/texinfo>
- Wget <http://www.gnu.org/software/wget/>
-- Gnulib <http://www.gnu.org/software/gnulib>
- Git <http://git.or.cz>
* Bootstrapping
diff --git a/bootstrap b/bootstrap
index 32ec2ab..e72894c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,9 +1,10 @@
#! /bin/sh
+# Print a version string.
+scriptversion=2014-12-08.12; # UTC
# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003-2008, 2010-2012, 2014-2015 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2015 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,7 +19,15 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Written by Paul Eggert.
+# Originally written by Paul Eggert. The canonical version of this
+# script is maintained as build-aux/bootstrap in gnulib, however, to
+# be useful to your project, you should place a copy of it under
+# version control in the top-level directory of your project. The
+# intent is that all customization can be done with a bootstrap.conf
+# file also maintained in your version control; gnulib comes with a
+# template build-aux/bootstrap.conf to get you started.
+
+# Please report bugs or propose patches to address@hidden
nl='
'
@@ -27,36 +36,77 @@ nl='
LC_ALL=C
export LC_ALL
+# Ensure that CDPATH is not set. Otherwise, the output from cd
+# would cause trouble in at least one use below.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
local_gl_dir=gl
-# Temporary directory names.
-bt='._bootmp'
-bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
-bt2=${bt}2
+# Honour $PERL, but work even if there is none
+PERL="${PERL-perl}"
+
+me=$0
usage() {
- echo >&2 "\
-Usage: $0 [OPTION]...
+ cat <<EOF
+Usage: $me [OPTION]...
Bootstrap this package from the checked-out sources.
Options:
- --gnulib-srcdir=DIRNAME Specify the local directory where gnulib
+ --gnulib-srcdir=DIRNAME specify the local directory where gnulib
sources reside. Use this if you already
have gnulib sources on your machine, and
do not want to waste your bandwidth downloading
- them again.
- --copy Copy files instead of creating symbolic links.
- --force Attempt to bootstrap even if the sources seem
- not to have been checked out.
- --skip-po Do not download po files.
-
-If the file bootstrap.conf exists in the current working directory, its
+ them again. Defaults to \$GNULIB_SRCDIR
+ --bootstrap-sync if this bootstrap script is not identical to
+ the version in the local gnulib sources,
+ update this script, and then restart it with
+ /bin/sh or the shell \$CONFIG_SHELL
+ --no-bootstrap-sync do not check whether bootstrap is out of sync
+ --copy copy files instead of creating symbolic links
+ --force attempt to bootstrap even if the sources seem
+ not to have been checked out
+ --no-git do not use git to update gnulib. Requires that
+ --gnulib-srcdir point to a correct gnulib snapshot
+ --skip-po do not download po files
+
+If the file $me.conf exists in the same directory as this script, its
contents are read as shell variables to configure the bootstrap.
+For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
+are honored.
+
Running without arguments will suffice in most cases.
-"
+EOF
}
+# warnf_ FORMAT-STRING ARG1...
+warnf_ ()
+{
+ warnf_format_=$1
+ shift
+ nl='
+'
+ case $* in
+ *$nl*) me_=$(printf "$me"|tr "$nl|" '??')
+ printf "$warnf_format_" "$@" | sed "s|^|$me_: |" ;;
+ *) printf "$me: $warnf_format_" "$@" ;;
+ esac >&2
+}
+
+# warn_ WORD1...
+warn_ ()
+{
+ # If IFS does not start with ' ', set it and emit the warning in a subshell.
+ case $IFS in
+ ' '*) warnf_ '%s\n' "$*";;
+ *) (IFS=' '; warn_ "$@");;
+ esac
+}
+
+# die WORD1...
+die() { warn_ "$@"; exit 1; }
+
# Configuration.
# Name of the Makefile.am
@@ -68,32 +118,51 @@ gnulib_modules=
# Any gnulib files needed that are not in modules.
gnulib_files=
+: ${AUTOPOINT=autopoint}
+: ${AUTORECONF=autoreconf}
+
+# A function to be called right after gnulib-tool is run.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_post_import_hook() { :; }
+
+# A function to be called after everything else in this script.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_epilogue() { :; }
+
# The command to download all .po files for a specified domain into
# a specified directory. Fill in the first %s is the domain name, and
# the second with the destination directory. Use rsync's -L and -r
# options because the latest/%s directory and the .po files within are
# all symlinks.
po_download_command_format=\
-"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
+"rsync --delete --exclude '*.s1' -Lrtvz \
+ 'translationproject.org::tp/latest/%s/' '%s'"
+# Fallback for downloading .po files (if rsync fails).
+po_download_command_format2=\
+"wget --mirror -nd -q -np -A.po -P '%s' \
+ http://translationproject.org/latest/%s/";
+
+# Prefer a non-empty tarname (4th argument of AC_INIT if given), else
+# fall back to the package name (1st argument with munging)
extract_package_name='
- /^AC_INIT(/{
- /.*,.*,.*, */{
- s///
- s/[][]//g
- s/)$//
+ /^AC_INIT(\[*/{
+ s///
+ /^[^,]*,[^,]*,[^,]*,[ []*\([^][ ,)]\)/{
+ s//\1/
+ s/[],)].*//
p
q
}
- s/AC_INIT(\[*//
- s/]*,.*//
+ s/[],)].*//
s/^GNU //
y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
- s/[^A-Za-z0-9_]/-/g
+ s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g
p
}
'
-package=`sed -n "$extract_package_name" configure.ac` || exit
+package=$(sed -n "$extract_package_name" configure.ac) \
+ || die 'cannot find package name in configure.ac'
gnulib_name=lib$package
build_aux=build-aux
@@ -101,17 +170,7 @@ source_base=lib
m4_base=m4
doc_base=doc
tests_base=tests
-
-# Extra files from gnulib, which override files from other sources.
-gnulib_extra_files="
- $build_aux/install-sh
- $build_aux/mdate-sh
- $build_aux/texinfo.tex
- $build_aux/depcomp
- $build_aux/config.guess
- $build_aux/config.sub
- doc/INSTALL
-"
+gnulib_extra_files=''
# Additional gnulib-tool options to use. Use "\newline" to break lines.
gnulib_tool_option_extras=
@@ -126,7 +185,8 @@ XGETTEXT_OPTIONS='\\\
--flag=error:3:c-format --flag=error_at_line:5:c-format\\\
'
-# Package bug report address for gettext files
+# Package bug report address and copyright holder for gettext files
+COPYRIGHT_HOLDER='Free Software Foundation, Inc.'
address@hidden
# Files we don't want to import.
@@ -145,8 +205,76 @@ copy=false
# on which version control system (if any) is used in the source directory.
vc_ignore=auto
+# Set this to true in bootstrap.conf to enable --bootstrap-sync by
+# default.
+bootstrap_sync=false
+
+# Use git to update gnulib sources
+use_git=true
+
+check_exists() {
+ if test "$1" = "--verbose"; then
+ ($2 --version </dev/null) >/dev/null 2>&1
+ if test $? -ge 126; then
+ # If not found, run with diagnostics as one may be
+ # presented with env variables to set to find the right version
+ ($2 --version </dev/null)
+ fi
+ else
+ ($1 --version </dev/null) >/dev/null 2>&1
+ fi
+
+ test $? -lt 126
+}
+
+# find_tool ENVVAR NAMES...
+# -------------------------
+# Search for a required program. Use the value of ENVVAR, if set,
+# otherwise find the first of the NAMES that can be run.
+# If found, set ENVVAR to the program name, die otherwise.
+#
+# FIXME: code duplication, see also gnu-web-doc-update.
+find_tool ()
+{
+ find_tool_envvar=$1
+ shift
+ find_tool_names=$@
+ eval "find_tool_res=\$$find_tool_envvar"
+ if test x"$find_tool_res" = x; then
+ for i; do
+ if check_exists $i; then
+ find_tool_res=$i
+ break
+ fi
+ done
+ fi
+ if test x"$find_tool_res" = x; then
+ warn_ "one of these is required: $find_tool_names;"
+ die "alternatively set $find_tool_envvar to a compatible tool"
+ fi
+ eval "$find_tool_envvar=\$find_tool_res"
+ eval "export $find_tool_envvar"
+}
+
# Override the default configuration, if necessary.
-test -r bootstrap.conf && . ./bootstrap.conf
+# Make sure that bootstrap.conf is sourced from the current directory
+# if we were invoked as "sh bootstrap".
+case "$0" in
+ */*) test -r "$0.conf" && . "$0.conf" ;;
+ *) test -r "$0.conf" && . ./"$0.conf" ;;
+esac
+
+# Extra files from gnulib, which override files from other sources.
+test -z "${gnulib_extra_files}" && \
+ gnulib_extra_files="
+ build-aux/install-sh
+ build-aux/mdate-sh
+ build-aux/texinfo.tex
+ build-aux/depcomp
+ build-aux/config.guess
+ build-aux/config.sub
+ doc/INSTALL
+"
if test "$vc_ignore" = auto; then
vc_ignore=
@@ -165,33 +293,70 @@ do
usage
exit;;
--gnulib-srcdir=*)
- GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
+ GNULIB_SRCDIR=${option#--gnulib-srcdir=};;
--skip-po)
SKIP_PO=t;;
--force)
checkout_only_file=;;
--copy)
copy=true;;
+ --bootstrap-sync)
+ bootstrap_sync=true;;
+ --no-bootstrap-sync)
+ bootstrap_sync=false;;
+ --no-git)
+ use_git=false;;
*)
- echo >&2 "$0: $option: unknown option"
- exit 1;;
+ die "$option: unknown option";;
esac
done
+$use_git || test -d "$GNULIB_SRCDIR" \
+ || die "Error: --no-git requires --gnulib-srcdir"
+
if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
- echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
- exit 1
+ die "Bootstrapping from a non-checked-out distribution is risky."
fi
-# If $STR is not already on a line by itself in $FILE, insert it,
-# sorting the new contents of the file and replacing $FILE with the result.
-insert_sorted_if_absent() {
+# Strip blank and comment lines to leave significant entries.
+gitignore_entries() {
+ sed '/^#/d; /^$/d' "$@"
+}
+
+# If $STR is not already on a line by itself in $FILE, insert it at the start.
+# Entries are inserted at the start of the ignore list to ensure existing
+# entries starting with ! are not overridden. Such entries support
+# whitelisting exceptions after a more generic blacklist pattern.
+insert_if_absent() {
file=$1
str=$2
test -f $file || touch $file
- echo "$str" | sort -u - $file | cmp -s - $file \
- || echo "$str" | sort -u - $file -o $file \
- || exit 1
+ test -r $file || die "Error: failed to read ignore file: $file"
+ duplicate_entries=$(gitignore_entries $file | sort | uniq -d)
+ if [ "$duplicate_entries" ] ; then
+ die "Error: Duplicate entries in $file: " $duplicate_entries
+ fi
+ linesold=$(gitignore_entries $file | wc -l)
+ linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc
-l)
+ if [ $linesold != $linesnew ] ; then
+ { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
+ || die "insert_if_absent $file $str: failed"
+ fi
+}
+
+# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
+# insert_if_absent.
+insert_vc_ignore() {
+ vc_ignore_file="$1"
+ pattern="$2"
+ case $vc_ignore_file in
+ *.gitignore)
+ # A .gitignore entry that does not start with '/' applies
+ # recursively to subdirectories, so prepend '/' to every
+ # .gitignore entry.
+ pattern=$(echo "$pattern" | sed s,^,/,);;
+ esac
+ insert_if_absent "$vc_ignore_file" "$pattern"
}
# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
@@ -200,11 +365,8 @@ grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])'
configure.ac \
>/dev/null && found_aux_dir=yes
grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
>/dev/null && found_aux_dir=yes
-if test $found_aux_dir = no; then
- echo "$0: expected line not found in configure.ac. Add the following:" >&2
- echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2
- exit 1
-fi
+test $found_aux_dir = yes \
+ || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it"
# If $build_aux doesn't exist, create it now, otherwise some bits
# below will malfunction. If creating it, also mark it as ignored.
@@ -212,76 +374,365 @@ if test ! -d $build_aux; then
mkdir $build_aux
for dot_ig in x $vc_ignore; do
test $dot_ig = x && continue
- insert_sorted_if_absent $dot_ig $build_aux
+ insert_vc_ignore $dot_ig $build_aux
done
fi
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+sort_ver() { # sort -V is not generally available
+ ver1="$1"
+ ver2="$2"
+
+ # split on '.' and compare each component
+ i=1
+ while : ; do
+ p1=$(echo "$ver1" | cut -d. -f$i)
+ p2=$(echo "$ver2" | cut -d. -f$i)
+ if [ ! "$p1" ]; then
+ echo "$1 $2"
+ break
+ elif [ ! "$p2" ]; then
+ echo "$2 $1"
+ break
+ elif [ ! "$p1" = "$p2" ]; then
+ if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison
+ echo "$2 $1"
+ elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison
+ echo "$1 $2"
+ else # numeric, then lexicographic comparison
+ lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1)
+ if [ "$lp" = "$p2" ]; then
+ echo "$1 $2"
+ else
+ echo "$2 $1"
+ fi
+ fi
+ break
+ fi
+ i=$(($i+1))
+ done
+}
+
+get_version() {
+ app=$1
+
+ $app --version >/dev/null 2>&1 || { $app --version; return 1; }
+
+ $app --version 2>&1 |
+ sed -n '# Move version to start of line.
+ s/.*[v ]\([0-9]\)/\1/
+
+ # Skip lines that do not start with version.
+ /^[0-9]/!d
+
+ # Remove characters after the version.
+ s/[^.a-z0-9-].*//
+
+ # The first component must be digits only.
+ s/^\([0-9]*\)[a-z-].*/\1/
+
+ #the following essentially does s/5.005/5.5/
+ s/\.0*\([1-9]\)/.\1/g
+ p
+ q'
+}
+
+check_versions() {
+ ret=0
+
+ while read app req_ver; do
+ # We only need libtoolize from the libtool package.
+ if test "$app" = libtool; then
+ app=libtoolize
+ fi
+ # Exempt git if --no-git is in effect.
+ if test "$app" = git; then
+ $use_git || continue
+ fi
+ # Honor $APP variables ($TAR, $AUTOCONF, etc.)
+ appvar=$(echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_')
+ test "$appvar" = TAR && appvar=AMTAR
+ case $appvar in
+ GZIP) ;; # Do not use $GZIP: it contains gzip options.
+ PERL::*) ;; # Keep perl modules as-is
+ *) eval "app=\${$appvar-$app}" ;;
+ esac
+
+ # Handle the still-experimental Automake-NG programs specially.
+ # They remain named as the mainstream Automake programs ("automake",
+ # and "aclocal") to avoid gratuitous incompatibilities with
+ # pre-existing usages (by, say, autoreconf, or custom autogen.sh
+ # scripts), but correctly identify themselves (as being part of
+ # "GNU automake-ng") when asked their version.
+ case $app in
+ automake-ng|aclocal-ng)
+ app=${app%-ng}
+ ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || {
+ warn_ "Error: '$app' not found or not from Automake-NG"
+ ret=1
+ continue
+ } ;;
+ # Another check is for perl modules. These can be written as
+ # e.g. perl::XML::XPath in case of XML::XPath module, etc.
+ perl::*)
+ # Extract module name
+ app="${app#perl::}"
+ if ! $PERL -m"$app" -e 'exit 0' >/dev/null 2>&1; then
+ warn_ "Error: perl module '$app' not found"
+ ret=1
+ fi
+ continue
+ ;;
+ esac
+ if [ "$req_ver" = "-" ]; then
+ # Merely require app to exist; not all prereq apps are well-behaved
+ # so we have to rely on $? rather than get_version.
+ if ! check_exists --verbose $app; then
+ warn_ "Error: '$app' not found"
+ ret=1
+ fi
+ else
+ # Require app to produce a new enough version string.
+ inst_ver=$(get_version $app)
+ if [ ! "$inst_ver" ]; then
+ warn_ "Error: '$app' not found"
+ ret=1
+ else
+ latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
+ if [ ! "$latest_ver" = "$inst_ver" ]; then
+ warnf_ '%s\n' \
+ "Error: '$app' version == $inst_ver is too old" \
+ " '$app' version >= $req_ver is required"
+ ret=1
+ fi
+ fi
+ fi
+ done
+
+ return $ret
+}
+
+print_versions() {
+ echo "Program Min_version"
+ echo "----------------------"
+ printf %s "$buildreq"
+ echo "----------------------"
+ # can't depend on column -t
+}
+
+# Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6.
+# Also find the compatible sha1 utility on the BSDs
+if test x"$SKIP_PO" = x; then
+ find_tool SHA1SUM sha1sum gsha1sum shasum sha1
+fi
+
+use_libtool=0
+# We'd like to use grep -E, to see if any of LT_INIT,
+# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
+# but that's not portable enough (e.g., for Solaris).
+grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
+ && use_libtool=1
+grep '^[ ]*LT_INIT' configure.ac >/dev/null \
+ && use_libtool=1
+if test $use_libtool = 1; then
+ find_tool LIBTOOLIZE glibtoolize libtoolize
+fi
+
+# gnulib-tool requires at least automake and autoconf.
+# If either is not listed, add it (with minimum version) as a prerequisite.
+case $buildreq in
+ *automake*) ;;
+ *) buildreq="automake 1.9
+$buildreq" ;;
+esac
+case $buildreq in
+ *autoconf*) ;;
+ *) buildreq="autoconf 2.59
+$buildreq" ;;
+esac
+
+# When we can deduce that gnulib-tool will require patch,
+# and when patch is not already listed as a prerequisite, add it, too.
+if test -d "$local_gl_dir" \
+ && ! find "$local_gl_dir" -name '*.diff' -exec false {} +; then
+ case $buildreq in
+ *patch*) ;;
+ *) buildreq="patch -
+$buildreq" ;;
+ esac
+fi
+
+if ! printf "$buildreq" | check_versions; then
+ echo >&2
+ if test -f README-prereq; then
+ die "See README-prereq for how to get the prerequisite programs"
+ else
+ die "Please install the prerequisite programs"
+ fi
+fi
+
+# Warn the user if autom4te appears to be broken; this causes known
+# issues with at least gettext 0.18.3.
+probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -)
+if test "x$probe" != xhi; then
+ warn_ "WARNING: your autom4te wrapper eats stdin;"
+ warn_ "if bootstrap fails, consider upgrading your autotools"
+fi
+
echo "$0: Bootstrapping from checked-out $package sources..."
+# See if we can use gnulib's git-merge-changelog merge driver.
+if $use_git && test -d .git && check_exists git; then
+ if git config merge.merge-changelog.driver >/dev/null ; then
+ :
+ elif check_exists git-merge-changelog; then
+ echo "$0: initializing git-merge-changelog driver"
+ git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
+ git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
+ else
+ echo "$0: consider installing git-merge-changelog from gnulib"
+ fi
+fi
+
+
cleanup_gnulib() {
status=$?
- rm -fr gnulib
+ rm -fr "$gnulib_path"
exit $status
}
-# Get gnulib files.
+git_modules_config () {
+ test -f .gitmodules && git config --file .gitmodules "$@"
+}
+
+if $use_git; then
+ gnulib_path=$(git_modules_config submodule.gnulib.path)
+ test -z "$gnulib_path" && gnulib_path=gnulib
+fi
+
+# Get gnulib files. Populate $GNULIB_SRCDIR, possibly updating a
+# submodule, for use in the rest of the script.
case ${GNULIB_SRCDIR--} in
-)
- if [ ! -d gnulib ]; then
+ # Note that $use_git is necessarily true in this case.
+ if git_modules_config submodule.gnulib.url >/dev/null; then
+ echo "$0: getting gnulib files..."
+ git submodule init -- "$gnulib_path" || exit $?
+ git submodule update -- "$gnulib_path" || exit $?
+
+ elif [ ! -d "$gnulib_path" ]; then
echo "$0: getting gnulib files..."
trap cleanup_gnulib 1 2 13 15
- git clone --depth 2 git://git.sv.gnu.org/gnulib ||
+ shallow=
+ git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+ git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
cleanup_gnulib
trap - 1 2 13 15
fi
- GNULIB_SRCDIR=gnulib
+ GNULIB_SRCDIR=$gnulib_path
+ ;;
+*)
+ # Use GNULIB_SRCDIR directly or as a reference.
+ if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
+ git_modules_config submodule.gnulib.url >/dev/null; then
+ echo "$0: getting gnulib files..."
+ if git submodule -h|grep -- --reference > /dev/null; then
+ # Prefer the one-liner available in git 1.6.4 or newer.
+ git submodule update --init --reference "$GNULIB_SRCDIR" \
+ "$gnulib_path" || exit $?
+ else
+ # This fallback allows at least git 1.5.5.
+ if test -f "$gnulib_path"/gnulib-tool; then
+ # Since file already exists, assume submodule init already complete.
+ git submodule update -- "$gnulib_path" || exit $?
+ else
+ # Older git can't clone into an empty directory.
+ rmdir "$gnulib_path" 2>/dev/null
+ git clone --reference "$GNULIB_SRCDIR" \
+ "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
+ && git submodule init -- "$gnulib_path" \
+ && git submodule update -- "$gnulib_path" \
+ || exit $?
+ fi
+ fi
+ GNULIB_SRCDIR=$gnulib_path
+ fi
+ ;;
esac
+# $GNULIB_SRCDIR now points to the version of gnulib to use, and
+# we no longer need to use git or $gnulib_path below here.
+
+if $bootstrap_sync; then
+ cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
+ echo "$0: updating bootstrap and restarting..."
+ case $(sh -c 'echo "$1"' -- a) in
+ a) ignored=--;;
+ *) ignored=ignored;;
+ esac
+ exec sh -c \
+ 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
+ $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \
+ "$0" "$@" --no-bootstrap-sync
+ }
+fi
+
gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit
+<$gnulib_tool || exit $?
# Get translations.
download_po_files() {
subdir=$1
domain=$2
- echo "$0: getting translations into $subdir for $domain..."
- cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
+ echo "$me: getting translations into $subdir for $domain..."
+ cmd=$(printf "$po_download_command_format" "$domain" "$subdir")
+ eval "$cmd" && return
+ # Fallback to HTTP.
+ cmd=$(printf "$po_download_command_format2" "$subdir" "$domain")
eval "$cmd"
}
-# Download .po files to $po_dir/.reference and copy only the new
+# Mirror .po files to $po_dir/.reference and copy only the new
# or modified ones into $po_dir. Also update $po_dir/LINGUAS.
+# Note po files that exist locally only are left in $po_dir but will
+# not be included in LINGUAS and hence will not be distributed.
update_po_files() {
# Directory containing primary .po files.
# Overwrite them only when we're sure a .po file is new.
po_dir=$1
domain=$2
- # Download *.po files into this dir.
+ # Mirror *.po files into this dir.
# Usually contains *.s1 checksum files.
ref_po_dir="$po_dir/.reference"
test -d $ref_po_dir || mkdir $ref_po_dir || return
download_po_files $ref_po_dir $domain \
&& ls "$ref_po_dir"/*.po 2>/dev/null |
- sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
+ sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
- langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
+ langs=$(cd $ref_po_dir && echo *.po | sed 's/\.po//g')
test "$langs" = '*' && langs=x
- for po in `cd $ref_po_dir && echo *.po|sed 's/\.po//g'`; do
+ for po in $langs; do
case $po in x) continue;; esac
new_po="$ref_po_dir/$po.po"
cksum_file="$ref_po_dir/$po.s1"
if ! test -f "$cksum_file" ||
- ! test -f "$po_dir/$po.po" ||
- ! sha1sum -c --status "$cksum_file" < "$new_po" > /dev/null; then
- echo "updated $po_dir/$po.po..."
- cp "$new_po" "$po_dir/$po.po" && sha1sum < "$new_po" > "$cksum_file"
+ ! test -f "$po_dir/$po.po" ||
+ ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then
+ echo "$me: updated $po_dir/$po.po..."
+ cp "$new_po" "$po_dir/$po.po" \
+ && $SHA1SUM < "$new_po" > "$cksum_file" || return
fi
done
}
@@ -306,349 +757,213 @@ symlink_to_dir()
# If the destination directory doesn't exist, create it.
# This is required at least for "lib/uniwidth/cjk.h".
- dst_dir=`dirname "$dst"`
+ dst_dir=$(dirname "$dst")
if ! test -d "$dst_dir"; then
mkdir -p "$dst_dir"
# If we've just created a directory like lib/uniwidth,
# tell version control system(s) it's ignorable.
# FIXME: for now, this does only one level
- parent=`dirname "$dst_dir"`
+ parent=$(dirname "$dst_dir")
for dot_ig in x $vc_ignore; do
- test $dot_ig = x && continue
- ig=$parent/$dot_ig
- insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
+ test $dot_ig = x && continue
+ ig=$parent/$dot_ig
+ insert_vc_ignore $ig "${dst_dir##*/}"
done
fi
if $copy; then
{
- test ! -h "$dst" || {
- echo "$0: rm -f $dst" &&
- rm -f "$dst"
- }
+ test ! -h "$dst" || {
+ echo "$me: rm -f $dst" &&
+ rm -f "$dst"
+ }
} &&
test -f "$dst" &&
cmp -s "$src" "$dst" || {
- echo "$0: cp -fp $src $dst" &&
- cp -fp "$src" "$dst"
+ echo "$me: cp -fp $src $dst" &&
+ cp -fp "$src" "$dst"
}
else
+ # Leave any existing symlink alone, if it already points to the source,
+ # so that broken build tools that care about symlink times
+ # aren't confused into doing unnecessary builds. Conversely, if the
+ # existing symlink's time stamp is older than the source, make it afresh,
+ # so that broken tools aren't confused into skipping needed builds. See
+ # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
test -h "$dst" &&
- src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
- dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
- test "$src_i" = "$dst_i" || {
- dot_dots=
- case $src in
- /*) ;;
- *)
- case /$dst/ in
- *//* | */../* | */./* | /*/*/*/*/*/)
- echo >&2 "$0: invalid symlink calculation: $src -> $dst"
- exit 1;;
- /*/*/*/*/) dot_dots=../../../;;
- /*/*/*/) dot_dots=../../;;
- /*/*/) dot_dots=../;;
- esac;;
- esac
-
- echo "$0: ln -fs $dot_dots$src $dst" &&
- ln -fs "$dot_dots$src" "$dst"
+ src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 &&
+ dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 &&
+ test "$src_i" = "$dst_i" &&
+ both_ls=$(ls -dt "$src" "$dst") &&
+ test "X$both_ls" = "X$dst$nl$src" || {
+ dot_dots=
+ case $src in
+ /*) ;;
+ *)
+ case /$dst/ in
+ *//* | */../* | */./* | /*/*/*/*/*/)
+ die "invalid symlink calculation: $src -> $dst";;
+ /*/*/*/*/) dot_dots=../../../;;
+ /*/*/*/) dot_dots=../../;;
+ /*/*/) dot_dots=../;;
+ esac;;
+ esac
+
+ echo "$me: ln -fs $dot_dots$src $dst" &&
+ ln -fs "$dot_dots$src" "$dst"
}
fi
}
}
-cp_mark_as_generated()
-{
- cp_src=$1
- cp_dst=$2
-
- if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
- symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst"
- elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then
- symlink_to_dir $local_gl_dir "$cp_dst"
- else
- case $cp_dst in
- *.[ch]) c1='/* '; c2=' */';;
- *.texi) c1='@c '; c2= ;;
- *.m4|*/Make*|Make*) c1='# ' ; c2= ;;
- *) c1= ; c2= ;;
- esac
-
- # If the destination directory doesn't exist, create it.
- # This is required at least for "lib/uniwidth/cjk.h".
- dst_dir=`dirname "$cp_dst"`
- test -d "$dst_dir" || mkdir -p "$dst_dir"
-
- if test -z "$c1"; then
- cmp -s "$cp_src" "$cp_dst" || {
- echo "$0: cp -f $cp_src $cp_dst" &&
- rm -f "$cp_dst" &&
- sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst"
- }
- else
- # Copy the file first to get proper permissions if it
- # doesn't already exist. Then overwrite the copy.
- cp "$cp_src" "$cp_dst-t" &&
- (
- echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
- echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
- sed "s!$bt_regex/!!g" "$cp_src"
- ) > $cp_dst-t &&
- if cmp -s "$cp_dst-t" "$cp_dst"; then
- rm -f "$cp_dst-t"
- else
- echo "$0: cp $cp_src $cp_dst # with edits" &&
- mv -f "$cp_dst-t" "$cp_dst"
- fi
- fi
- fi
-}
-
version_controlled_file() {
- dir=$1
+ parent=$1
file=$2
- found=no
- if test -d CVS; then
- grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
- grep '^/[^/]*/[0-9]' > /dev/null && found=yes
- elif test -d .git; then
- git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
+ if test -d .git; then
+ git rm -n "$file" > /dev/null 2>&1
elif test -d .svn; then
- svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
+ svn log -r HEAD "$file" > /dev/null 2>&1
+ elif test -d CVS; then
+ grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null |
+ grep '^/[^/]*/[0-9]' > /dev/null
else
- echo "$0: no version control for $dir/$file?" >&2
+ warn_ "no version control for $file?"
+ false
fi
- test $found = yes
}
-# AWK program to convert a Makefile(.am) file rules to Automake 1.11
-# silent mode.
-silent_rules_prog='
-# state = 0 - outside rules
-# state = 1 - first line inside a rule
-# state = 2 - subsequent lines inside a rule
-# cont = 1 - this line is a continuation of the previous one
-# defn = 1 - insert AM_V_GEN/AM_V_at definitions after the initail comment
-# Print comment lines
-/^[ \t]*#/ { print; next }
-# Insert AM_V_ definitions, if required.
-state == 0 && defn == 1 {
- print "AM_DEFAULT_VERBOSITY=0" # FIXME
- print "AM_V_GEN = $(am__v_GEN_$(V))"
- print "am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))"
- print "am__v_GEN_0 = @echo \" GEN \" $@;"
- print "AM_V_at = $(am__v_at_$(V))"
- print "am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))"
- print "am__v_at_0 = @"
- defn = 0
-}
-# Start of a rule
-/^[^ \t].*:/ { print; state = 1; cont = 0; next }
-# First action within the rule
-state == 1 && /^\t/ {
- # Print silent rules without changes. The second match
- # is necessary to handle @VAR@ substitutions.
- if (!(match($1, /^@/) && !match($1, /address@hidden/)))
- sub(/^\t[\t ]*/, "&$(AM_V_GEN)")
- print
- cont = match($0, /\\$/)
- state = 2
- next
-}
-# All non-continuation lines within the rule are prefixed
-# with $(AM_V_at).
-state == 2 && /^\t/ && NF > 0 {
- if (!cont)
- sub(/^\t[\t ]*/, "&$(AM_V_at)")
- print
- cont = match($0, /\\$/)
- next
-}
-# Everything else is output verbatim
-{ print }
-'
+# NOTE: we have to be careful to run both autopoint and libtoolize
+# before gnulib-tool, since gnulib-tool is likely to provide newer
+# versions of files "installed" by these two programs.
+# Then, *after* gnulib-tool (see below), we have to be careful to
+# run autoreconf in such a way that it does not run either of these
+# two just-pre-run programs.
+
+# Import from gettext.
+with_gettext=yes
+grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
+ with_gettext=no
-silent_rules=yes
-grep 'AM_SILENT_RULES' configure.ac > /dev/null ||
- grep '^[ ]*AM_INIT_AUTOMAKE([^)][^)]*silent-rules' configure.ac >
/dev/null ||
- silent_rules=no
+if test $with_gettext = yes || test $use_libtool = 1; then
-silentize() {
- if test "$silent_rules" = yes; then
- case $1 in
- *.am) defn=0;;
- *.in) defn=1;;
+ tempbase=.bootstrap$$
+ trap "rm -f $tempbase.0 $tempbase.1" 1 2 13 15
+
+ > $tempbase.0 > $tempbase.1 &&
+ find . ! -type d -print | sort > $tempbase.0 || exit
+
+ if test $with_gettext = yes; then
+ # Released autopoint has the tendency to install macros that have been
+ # obsoleted in current gnulib, so run this before gnulib-tool.
+ echo "$0: $AUTOPOINT --force"
+ $AUTOPOINT --force || exit
+ fi
+
+ # Autoreconf runs aclocal before libtoolize, which causes spurious
+ # warnings if the initial aclocal is confused by the libtoolized
+ # (or worse out-of-date) macro directory.
+ # libtoolize 1.9b added the --install option; but we support back
+ # to libtoolize 1.5.22, where the install action was default.
+ if test $use_libtool = 1; then
+ install=
+ case $($LIBTOOLIZE --help) in
+ *--install*) install=--install ;;
esac
- awk -v defn=$defn "$silent_rules_prog" $1 > ${1}-t &&
- mv ${1}-t $1
+ echo "running: $LIBTOOLIZE $install --copy"
+ $LIBTOOLIZE $install --copy
fi
-}
-slurp() {
- for dir in . `(cd $1 && find * -type d -print)`; do
- copied=
- sep=
- for file in `ls -a $1/$dir`; do
- case $file in
- .|..) continue;;
- .*) continue;; # FIXME: should all file names starting with "." be
ignored?
- esac
- test -d $1/$dir/$file && continue
- for excluded_file in $excluded_files; do
- test "$dir/$file" = "$excluded_file" && continue 2
+ find . ! -type d -print | sort >$tempbase.1
+ old_IFS=$IFS
+ IFS=$nl
+ for file in $(comm -13 $tempbase.0 $tempbase.1); do
+ IFS=$old_IFS
+ parent=${file%/*}
+ version_controlled_file "$parent" "$file" || {
+ for dot_ig in x $vc_ignore; do
+ test $dot_ig = x && continue
+ ig=$parent/$dot_ig
+ insert_vc_ignore "$ig" "${file##*/}"
done
- if test $file = Makefile.am; then
- copied=$copied${sep}$gnulib_mk; sep=$nl
- remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
- sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/$gnulib_mk || {
- echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
- rm -f $dir/$gnulib_mk &&
- sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
- }
- elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
- version_controlled_file $dir $file; then
- echo "$0: $dir/$file overrides $1/$dir/$file"
- else
- copied=$copied$sep$file; sep=$nl
- if test $file = gettext.m4; then
- echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
- rm -f $dir/$file
- sed '
- /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
- AC_DEFUN([AM_INTL_SUBDIR], [
- /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
- AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
- $a\
- AC_DEFUN([gl_LOCK_EARLY], [])
- ' $1/$dir/$file >$dir/$file
- else
- cp_mark_as_generated $1/$dir/$file $dir/$file
- fi
- fi || exit
- done
-
- for dot_ig in x $vc_ignore; do
- test $dot_ig = x && continue
- ig=$dir/$dot_ig
- if test -n "$copied"; then
- insert_sorted_if_absent $ig "$copied"
- # If an ignored file name ends with .in.h, then also add
- # the name with just ".h". Many gnulib headers are generated,
- # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
- # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
- f=`echo "$copied"|sed
's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
- insert_sorted_if_absent $ig "$f"
-
- # For files like sys_stat.in.h and sys_time.in.h, record as
- # ignorable the directory we might eventually create: sys/.
- f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
- insert_sorted_if_absent $ig "$f"
- fi
- done
+ }
done
-}
-
+ IFS=$old_IFS
-# Create boot temporary directories to import from gnulib and gettext.
-rm -fr $bt $bt2 &&
-mkdir $bt $bt2 || exit
+ rm -f $tempbase.0 $tempbase.1
+ trap - 1 2 13 15
+fi
# Import from gnulib.
gnulib_tool_options="\
--import\
--no-changelog\
- --aux-dir $bt/$build_aux\
- --doc-base $bt/$doc_base\
+ --aux-dir $build_aux\
+ --doc-base $doc_base\
--lib $gnulib_name\
- --m4-base $bt/$m4_base/\
- --source-base $bt/$source_base/\
- --tests-base $bt/$tests_base\
+ --m4-base $m4_base/\
+ --source-base $source_base/\
+ --tests-base $tests_base\
--local-dir $local_gl_dir\
$gnulib_tool_option_extras\
"
+if test $use_libtool = 1; then
+ case "$gnulib_tool_options " in
+ *' --libtool '*) ;;
+ *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
+ esac
+fi
echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
-$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
-slurp $bt || exit
+$gnulib_tool $gnulib_tool_options --import $gnulib_modules \
+ || die "gnulib-tool failed"
for file in $gnulib_files; do
- symlink_to_dir "$GNULIB_SRCDIR" $file || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file \
+ || die "failed to symlink $file"
done
+bootstrap_post_import_hook \
+ || die "bootstrap_post_import_hook failed"
-# Import from gettext.
-with_gettext=yes
-grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
- with_gettext=no
-
-if test $with_gettext = yes; then
- echo "$0: (cd $bt2; autopoint) ..."
- cp configure.ac $bt2 &&
- (cd $bt2 && autopoint && rm configure.ac) &&
- slurp $bt2 $bt || exit
-
- rm -fr $bt $bt2 || exit
-fi
-
-# Coreutils is unusual in that it generates some of its test-related
-# Makefile.am files. That must be done before invoking automake.
-mam_template=tests/Makefile.am.in
-if test -f $mam_template; then
- PERL=perl
- for tool in cut head join pr sort tac tail test tr uniq wc; do
- m=tests/$tool/Makefile.am
- t=${m}t
- rm -f $m $t
- sed -n '1,/^##test-files-begin/p' $mam_template > $t
- echo "x = $tool" >> $t
- srcdir=tests/$tool
- $PERL -I$srcdir -w -- tests/mk-script $srcdir --list >> $t
- sed -n '/^##test-files-end/,$p' $mam_template >> $t
- chmod -w $t
- mv $t $m
- done
-fi
-
-# Remove any dangling symlink matching "*.m4" in the gnulib-populated
-# $m4_base directory, since such a file would cause aclocal to fail.
+# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
+# gnulib-populated directories. Such .m4 files would cause aclocal to fail.
# The following requires GNU find 4.2.3 or newer. Considering the usual
# portability constraints of this script, that may seem a very demanding
# requirement, but it should be ok. Ignore any failure, which is fine,
# since this is only a convenience to help developers avoid the relatively
# unusual case in which a symlinked-to .m4 file is git-removed from gnulib
# between successive runs of this script.
-find "$m4_base" -name '*.m4' -depth -type l -xtype l -delete > /dev/null 2>&1
-
-# Reconfigure, getting other files.
-
-aclocal_flags=`sed -n 's/ACLOCAL_AMFLAGS *=//p' Makefile.am`
-for command in \
- libtool \
- "aclocal --force $aclocal_flags" \
- 'autoconf --force' \
- 'autoheader --force' \
- 'automake --add-missing --copy --force-missing';
-do
- if test "$command" = libtool; then
- grep '^[ ]*AM_PROG_LIBTOOL\>' configure.ac >/dev/null ||
- continue
- command='libtoolize -c -f'
- fi
- echo "$0: $command ..."
- $command || exit
-done
+find "$m4_base" "$source_base" \
+ -depth \( -name '*.m4' -o -name '*.[ch]' \) \
+ -type l -xtype l -delete > /dev/null 2>&1
+
+# Invoke autoreconf with --force --install to ensure upgrades of tools
+# such as ylwrap.
+AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
+
+# Some systems (RHEL 5) are using ancient autotools, for which the
+# --no-recursive option had not been invented. Detect that lack and
+# omit the option when it's not supported. FIXME in 2017: remove this
+# hack when RHEL 5 autotools are updated, or when they become irrelevant.
+case $($AUTORECONF --help) in
+ *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";;
+esac
+# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
+echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS"
+AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \
+ || die "autoreconf failed"
# Get some extra files from gnulib, overriding existing files.
for file in $gnulib_extra_files; do
case $file in
*/INSTALL) dst=INSTALL;;
- build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
+ build-aux/*) dst=$build_aux/${file#build-aux/};;
*) dst=$file;;
esac
- symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file $dst \
+ || die "failed to symlink $file"
done
if test $with_gettext = yes; then
@@ -657,15 +972,27 @@ if test $with_gettext = yes; then
rm -f po/Makevars
sed '
/^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
- /^MSGID_BUGS_ADDRESS *=/s/=.*/= '"$MSGID_BUGS_ADDRESS"'/
/^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
+ /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
/^XGETTEXT_OPTIONS *=/{
s/$/ \\/
a\
- '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
+ '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
}
- ' po/Makevars.template >po/Makevars
- silentize po/Makefile.in.in
+ ' po/Makevars.template >po/Makevars \
+ || die 'cannot generate po/Makevars'
+
+ # If the 'gettext' module is in use, grab the latest Makefile.in.in.
+ # If only the 'gettext-h' module is in use, assume autopoint already
+ # put the correct version of this file into place.
+ case $gnulib_modules in
+ *gettext-h*) ;;
+ *gettext*)
+ cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \
+ || die "cannot create po/Makefile.in.in"
+ ;;
+ esac
+
if test -d runtime-po; then
# Similarly for runtime-po/Makevars, but not quite the same.
rm -f runtime-po/Makevars
@@ -673,17 +1000,27 @@ if test $with_gettext = yes; then
/^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
/^subdir *=.*/s/=.*/= runtime-po/
/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
- /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
/^XGETTEXT_OPTIONS *=/{
- s/$/ \\/
- a\
- '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+ s/$/ \\/
+ a\
+ '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
}
- ' <po/Makevars.template >runtime-po/Makevars
+ ' po/Makevars.template >runtime-po/Makevars \
+ || die 'cannot generate runtime-po/Makevars'
# Copy identical files from po to runtime-po.
(cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
fi
fi
+bootstrap_epilogue
+
echo "$0: done. Now you can run './configure'."
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/bootstrap.conf b/bootstrap.conf
index 4e65e89..2105b20 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,4 +1,4 @@
-# Bootstrap configuration for GNU Mailutils.
+# Bootstrap configuration for GNU Mailutils. -*- shell-script -*-
#
# Copyright (C) 2006-2012, 2014-2015 Free Software Foundation, Inc.
#
@@ -16,18 +16,11 @@
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
test -d lib/gnu || mkdir lib/gnu
-test -f lib/gnu/Makefile.am || cat > lib/gnu/Makefile.am <<EOT
-# THIS FILE IS GENERATED AUTOMATICALLY. PLEASE DO NOT EDIT.
-include gnulib.mk
-AM_CPPFLAGS += @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/lib/gnu
-I${top_builddir}/lib/gnu
-# Local Variables:
-# buffer-read-only: t
-# End:
-# vi: set ro:
-EOT
gnulib_name=libgnu
+gnulib_mk=Makefile.am
source_base=lib/gnu
+gnulib_tool_option_extras="--libtool --local-dir=lib/local"
# We don't need these modules, even though gnulib-tool mistakenly
# includes them because of gettext dependencies.
@@ -37,6 +30,7 @@ avoided_gnulib_modules='
# gnulib modules used by this package.
gnulib_modules="$avoided_gnulib_modules
+mu_am_flags
`grep '^[^#]' gnulib.modules`
"
diff --git a/configure.ac b/configure.ac
index 6485227..5278d18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,7 @@ AC_SUBST(mu_aux_dir,'$(top_srcdir)/mu-aux')
AC_SUBST(MU_SIEVE_MODDIR,'$(libdir)/$(PACKAGE)')
AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)')
-AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a
../libmu_cfg/libmu_cfg.la ../lib/libmuaux.a')
+AC_SUBST(MU_APP_LIBRARIES,'${top_builddir}/libmu_argp/libmu_argp.la
${top_builddir}/libmu_cfg/libmu_cfg.la')
# There are two sets of include directories: MU_LIB_COMMON_INCLUDES, used
# by the libraries, and MU_APP_COMMON_INCLUDES, which is used by applications.
@@ -93,6 +93,7 @@ status_mysql=no
status_pgsql=no
status_ldap=no
status_tcpwrap=maybe
+status_readline=probe
dnl Internationalization macros.
AM_GNU_GETTEXT([external], [need-ngettext])
@@ -220,7 +221,7 @@ esac
LIBS=$saved_LIBS
if test "$status_tcpwrap" = "yes"; then
- AC_SUBST(TCPWRAP_LIBRARIES, "$TCPWRAP_LIBRARIES -lwrap")
+ AC_SUBST(TCPWRAP_LIBRARIES, "\${top_builddir}/lib/libmutcpwrap.a
$TCPWRAP_LIBRARIES -lwrap")
AC_DEFINE_UNQUOTED(WITH_LIBWRAP, 1,
[Define to 1 to use tcp wrappers.])
fi
@@ -240,10 +241,10 @@ AC_ARG_WITH([readline],
[do not use readline]),
[
case "${withval}" in
- yes) usereadline=yes ;;
- no) usereadline=no ;;
+ yes) status_readline=yes ;;
+ no) status_readline=no ;;
*) AC_MSG_ERROR(bad value ${withval} for --without-readline) ;;
-esac],[usereadline=yes])
+esac],[status_readline=probe])
AC_SUBST(SERV_AUTHLIBS)
AC_SUBST(SERV_AUTHINCS)
@@ -560,6 +561,10 @@ check_dbm_impl() {
if test $has_ndbm = yes; then
AC_DEFINE(WITH_NDBM,1,[Enable use of NDBM])
status_dbm="$status_dbm,NDBM"
+ save_LIBS=$LIBS
+ LIBS="$LIBS $DBMLIBS"
+ AC_CHECK_FUNCS(dbm_dirfno dbm_pagfno)
+ LIBS=$save_LIBS
fi
;;
@@ -1107,17 +1112,24 @@ AC_SUBST(CURSES_LIBS)
dnl Check for GNU Readline
AC_SUBST(READLINE_LIBS)
-if test "$usereadline" = "yes"; then
+if test "$status_readline" != "no"; then
dnl FIXME This should only link in the curses libraries if it's
dnl really needed!
saved_LIBS=$LIBS
LIBS="$LIBS $CURSES_LIBS"
- AC_CHECK_LIB(readline, readline, mu_have_readline=yes)
+ AC_CHECK_LIB(readline, readline,
+ [status_readline=yes],
+ [if test "$status_readline" = "yes"; then
+ AC_MSG_ERROR(readline requested but does not seem to be
installed)
+ else
+ status_readline=no
+ fi
+ ])
LIBS=$saved_LIBS
- if test "$mu_have_readline" = "yes"; then
+ if test "$status_readline" = "yes"; then
AC_CHECK_HEADERS(readline/readline.h,
AC_DEFINE(WITH_READLINE,1,[Enable use of readline]))
READLINE_LIBS="-lreadline $CURSES_LIBS"
@@ -1125,13 +1137,12 @@ if test "$usereadline" = "yes"; then
LIBS="$LIBS $READLINE_LIBS"
AC_CHECK_FUNCS(rl_completion_matches)
LIBS=$saved_LIBS
- else
- AC_MSG_WARN(readline requested but does not seem to be
installed)
fi
-
+else
+ status_readline=no
fi
-AM_CONDITIONAL([MU_COND_READLINE], [test "$usereadline" = "yes"])
+AM_CONDITIONAL([MU_COND_READLINE], [test "$status_readline" = "yes"])
AH_BOTTOM([
/* Newer versions of readline have rl_completion_matches */
@@ -1157,7 +1168,6 @@ GINT_INIT([gint],[1.8 with-guile],
LIBMU_SCM_DEPS='${MU_LIB_MBOX} ${MU_LIB_IMAP} ${MU_LIB_POP}
${MU_LIB_MH} ${MU_LIB_MAILDIR} ${MU_LIB_MAILER}'
MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules'
GINT_INCLUDES='${MU_APP_COMMON_INCLUDES}'
- GINT_LDADD=../lib/libmuaux.a
],[useguile=no])
AM_CONDITIONAL([MU_COND_LIBMU_SCM],[test "$useguile" = "yes"])
@@ -1425,7 +1435,7 @@ status_python=$status_python
status_cxx=$mu_cv_enable_cxx
status_tcpwrap=$status_tcpwrap
status_pthread=$usepthread
-status_readline=$usereadline
+status_readline=$status_readline
status_mysql=$status_mysql
status_pgsql=$status_pgsql
status_radius=$mu_cv_enable_radius
@@ -1529,3 +1539,6 @@ AC_CONFIG_FILES([
])
AC_OUTPUT
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 91d8f56..415aead 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -59,7 +59,7 @@ mod_LTLIBRARIES = numaddr.la
AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
LDADD = \
- ../lib/libmuaux.a\
+ ../lib/libmuaux.la\
${MU_LIB_MAILUTILS}\
@MU_COMMON_LIBRARIES@
@@ -68,20 +68,20 @@ numaddr_la_LIBADD = ${MU_LIB_SIEVE}
numaddr_la_LDFLAGS = -module -avoid-version -no-undefined -rpath '$(moddir)'
msg_send_LDADD =\
- ../lib/libmuaux.a\
+ ../lib/libmuaux.la\
${MU_LIB_MAILER}\
@address@hidden
${MU_LIB_MAILUTILS}
address@hidden@ -I${top_srcdir}/lib -I${top_builddir}/lib
mta_LDADD =\
- ../lib/libmuaux.a\
+ ../lib/libmuaux.la\
${MU_LIB_MBOX}\
${MU_LIB_MAILER}\
${MU_LIB_MAILUTILS}
sfrom_LDADD =\
- ../lib/libmuaux.a\
+ ../lib/libmuaux.la\
${MU_LIB_MBOX}\
${MU_LIB_IMAP}\
${MU_LIB_POP}\
@@ -93,7 +93,7 @@ sfrom_LDADD =\
${MU_LIB_MAILUTILS}
nntpclient_LDADD = \
- ../lib/libmuaux.a\
+ ../lib/libmuaux.la\
${MU_LIB_NNTP}\
${MU_LIB_AUTH}\
@address@hidden
@@ -125,7 +125,7 @@ muemail_LDADD = \
mboxidx_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
mboxidx_LDADD=\
- ../lib/libmuaux.a\
+ ../lib/libmuaux.la\
${MU_LIB_MBOX}\
${MU_LIB_IMAP}\
${MU_LIB_POP}\
diff --git a/examples/cpp/Makefile.am b/examples/cpp/Makefile.am
index d10e817..1e6ed7a 100644
--- a/examples/cpp/Makefile.am
+++ b/examples/cpp/Makefile.am
@@ -34,7 +34,7 @@ noinst_PROGRAMS = @MU_CXX_EXAMPLES_BUILD@
AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
AM_LDFLAGS = \
- ../../lib/libmuaux.a\
+ ../../lib/libmuaux.la\
../../libmu_cpp/libmu_cpp.la\
${MU_LIB_MAILUTILS}\
@MU_COMMON_LIBRARIES@
@@ -52,7 +52,7 @@ sfrom_SOURCES = sfrom.cc
url_parse_SOURCES = url-parse.cc
LDADD =\
- ../../lib/libmuaux.a\
+ ../../lib/libmuaux.la\
../../libmu_cpp/libmu_cpp.la\
${MU_LIB_MBOX}\
${MU_LIB_IMAP}\
diff --git a/examples/mboxidx.c b/examples/mboxidx.c
index d4afe34..c9154dc 100644
--- a/examples/mboxidx.c
+++ b/examples/mboxidx.c
@@ -124,7 +124,7 @@ static int
set_charset_filter (mu_stream_t * str, char *input_charset)
{
int rc;
- char const *args[4];
+ char const *args[5];
mu_stream_t b_stream = *str;
diff --git a/gnulib b/gnulib
new file mode 160000
index 0000000..a6aa0b6
--- /dev/null
+++ b/gnulib
@@ -0,0 +1 @@
+Subproject commit a6aa0b6f74864a94e940b310f6200e18f7d9dcc9
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index ed36979..f2d0614 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -87,6 +87,6 @@ imap4d_LDADD = \
## Think about better approach --gray
imap4d_DEPENDENCIES = \
@address@hidden
- ../lib/libmuaux.a\
+ ../lib/libmuaux.la\
${MU_LIB_MBOX}\
${MU_LIB_MAILUTILS}
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 124fef2..4205809 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -24,19 +24,21 @@ AM_CPPFLAGS = \
@address@hidden
@PYTHON_INCLUDES@
-noinst_LIBRARIES = libmuaux.a libmuscript.a
-libmuaux_a_SOURCES = \
+lib_LTLIBRARIES = libmuaux.la
+noinst_LIBRARIES = libmuscript.a libmutcpwrap.a
+
+libmuaux_la_SOURCES = \
argp_base.c\
daemon.c\
mailcap.c\
manlock.c\
signal.c\
strexit.c\
- tcpwrap.c\
mu_umaxtostr.c\
mu_umaxtostr.h
-libmuaux_a_LIBADD=gnu/*.o
-#libmuaux_a_LIBADD=`$(AR) t gnu/libgnu.a | sed s.^.gnu/.`
+libmuaux_la_LIBADD=gnu/libgnu.la
+
+libmutcpwrap_a_SOURCES = tcpwrap.c
noinst_HEADERS =\
mailcap.h\
diff --git a/lib/guile.c b/lib/guile.c
index 4a922a9..32a3096 100644
--- a/lib/guile.c
+++ b/lib/guile.c
@@ -15,6 +15,9 @@
You should have received a copy of the GNU General Public License
along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. */
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
#include "muscript.h"
#include "muscript_priv.h"
#include <mailutils/guile.h>
diff --git a/lib/local/modules/mu_am_flags b/lib/local/modules/mu_am_flags
new file mode 100644
index 0000000..5fc4bef
--- /dev/null
+++ b/lib/local/modules/mu_am_flags
@@ -0,0 +1,14 @@
+Description:
+This file provides additional Makefile statements for building gnulib as part
+of libmuaux.
+
+Files:
+
+Makefile.am:
+AM_CPPFLAGS += @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/lib/gnu
-I${top_builddir}/lib/gnu
+
+License:
+LGPL
+
+Maintainer:
+Sergey Poznyakoff
diff --git a/lib/muscript.h b/lib/muscript.h
index 1a653ed..a58170b 100644
--- a/lib/muscript.h
+++ b/lib/muscript.h
@@ -15,9 +15,6 @@
You should have received a copy of the GNU General Public License
along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. */
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
#include <mailutils/sieve.h>
#include <mailutils/diag.h>
#include <mailutils/errno.h>
diff --git a/lib/python.c b/lib/python.c
index 1c27f26..7fb32ee 100644
--- a/lib/python.c
+++ b/lib/python.c
@@ -14,6 +14,9 @@
You should have received a copy of the GNU General Public License
along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. */
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
#include "muscript.h"
#include "muscript_priv.h"
#include <mailutils/python.h>
@@ -32,6 +35,7 @@ static int
python_done (mu_script_descr_t descr)
{
free (descr);
+ return 0;
}
static int
@@ -56,7 +60,7 @@ python_proc (mu_script_descr_t descr, mu_message_t msg)
data[0].attrs = dict;
dict[1].name = NULL;
-mu_py_script_run ((char*)descr, data);
+ mu_py_script_run ((char*)descr, data);
mu_py_script_finish ();
return 0;
}
diff --git a/lib/script.c b/lib/script.c
index 27ca3bf..f4f7756 100644
--- a/lib/script.c
+++ b/lib/script.c
@@ -15,6 +15,9 @@
You should have received a copy of the GNU General Public License
along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. */
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
#include "muscript.h"
#include "muscript_priv.h"
diff --git a/lib/sieve.c b/lib/sieve.c
index 7705eff..ab9e619 100644
--- a/lib/sieve.c
+++ b/lib/sieve.c
@@ -15,6 +15,9 @@
You should have received a copy of the GNU General Public License
along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>. */
+#if defined(HAVE_CONFIG_H)
+# include <config.h>
+#endif
#include "muscript.h"
#include "muscript_priv.h"
diff --git a/libmailutils/address/address.c b/libmailutils/address/address.c
index 86e90c0..2ef1468 100644
--- a/libmailutils/address/address.c
+++ b/libmailutils/address/address.c
@@ -788,7 +788,7 @@ mu_address_union (mu_address_t *a, mu_address_t b)
if (rc)
{
_address_free (last);
- memset (last, 0, sizeof (last));
+ memset (last, 0, sizeof (*last));
return rc;
}
}
diff --git a/libmailutils/cfg/parser.y b/libmailutils/cfg/parser.y
index 945e9d1..f2d00ea 100644
--- a/libmailutils/cfg/parser.y
+++ b/libmailutils/cfg/parser.y
@@ -1170,7 +1170,7 @@ _set_fun (void *item, void *data)
void *tgt;
size_t size;
- if (clos->type >= MU_ARRAY_SIZE(config_type_size)
+ if ((size_t) clos->type >= MU_ARRAY_SIZE(config_type_size)
|| (size = config_type_size[clos->type]) == 0)
{
mu_diag_at_locus (MU_LOG_EMERG, clos->locus,
diff --git a/libmailutils/diag/wd.c b/libmailutils/diag/wd.c
index 3955c77..7212cad 100644
--- a/libmailutils/diag/wd.c
+++ b/libmailutils/diag/wd.c
@@ -49,7 +49,7 @@ mu_wd (unsigned to)
if (to)
{
_count_down = to;
- while (_count_down--);
+ while (_count_down--)
{
sleep (1);
}
diff --git a/libmailutils/mailbox/body.c b/libmailutils/mailbox/body.c
index 1752d6c..f92f8bf 100644
--- a/libmailutils/mailbox/body.c
+++ b/libmailutils/mailbox/body.c
@@ -116,20 +116,31 @@ body_stream_transport (mu_stream_t stream, int mode,
mu_stream_t *pstr)
static int
bstr_close (struct _mu_stream *stream)
{
+ /* FIXME: While technically correct, the code below can result is
+ segmentation violations under some conditions, because reference
+ counters are not yet implemented for mu_body_t objects and so
+ str->body can be destroyed prior to calling that function.
+ See also bstr_done.
+ */
+#if 0
struct _mu_body_stream *str = (struct _mu_body_stream*) stream;
mu_body_t body = str->body;
mu_stream_close (body->rawstream);
mu_stream_close (body->fstream);
+#endif
return 0;
}
void
bstr_done (struct _mu_stream *stream)
{
+#if 0
+ /* FIXME: See comment above */
struct _mu_body_stream *str = (struct _mu_body_stream*) stream;
mu_body_t body = str->body;
mu_stream_destroy (&body->rawstream);
mu_stream_destroy (&body->fstream);
+#endif
}
static int
diff --git a/libmailutils/server/msrv.c b/libmailutils/server/msrv.c
index 66daefc..00b37dc 100644
--- a/libmailutils/server/msrv.c
+++ b/libmailutils/server/msrv.c
@@ -391,7 +391,7 @@ mu_m_server_get_hints (mu_m_server_t srv, struct
mu_sockaddr_hints *hints)
{
if (!hints)
return EINVAL;
- memcpy (hints, &srv->hints, sizeof (hints));
+ memcpy (hints, &srv->hints, sizeof (*hints));
return 0;
}
diff --git a/libmailutils/tests/url-parse.c b/libmailutils/tests/url-parse.c
index 90a1eb4..fcfa416 100644
--- a/libmailutils/tests/url-parse.c
+++ b/libmailutils/tests/url-parse.c
@@ -164,7 +164,7 @@ main (int argc, char **argv)
mu_error ("cannot get %s: %s", "port", mu_strerror (rc));
exit (1);
}
- printf ("port %hu\n", port);
+ printf ("port %u\n", port);
GET_AND_PRINT (path, u, buf, rc);
print_fvpairs (u);
diff --git a/libmu_argp/Makefile.am b/libmu_argp/Makefile.am
index d3f118d..5f380c1 100644
--- a/libmu_argp/Makefile.am
+++ b/libmu_argp/Makefile.am
@@ -23,9 +23,9 @@ AM_CPPFLAGS = \
-DSITE_VIRTUAL_PWDDIR=\"@address@hidden"\
-DSITE_CRAM_MD5_PWD=\"@address@hidden"
-lib_LIBRARIES = libmu_argp.a
+lib_LTLIBRARIES = libmu_argp.la
-libmu_argp_a_SOURCES =\
+libmu_argp_la_SOURCES =\
cmdline.c\
cmdline.h\
common.c\
@@ -33,3 +33,4 @@ libmu_argp_a_SOURCES =\
muinit.c\
sieve.c
+libmu_argp_la_LDFLAGS=-L${top_builddir}/lib -lmuaux
diff --git a/libmu_compat/vartab.c b/libmu_compat/vartab.c
index da45a4c..7116fd5 100644
--- a/libmu_compat/vartab.c
+++ b/libmu_compat/vartab.c
@@ -75,7 +75,7 @@ vardefn_free (struct vardefn *vd)
else if (!(vd->flags & MU_VARDEFN_STATIC))
free (vd->value);
}
- memset (vd, 0, sizeof vd);
+ memset (vd, 0, sizeof *vd);
}
int
diff --git a/libmu_dbm/ndbm.c b/libmu_dbm/ndbm.c
index 81966f8..17460df 100644
--- a/libmu_dbm/ndbm.c
+++ b/libmu_dbm/ndbm.c
@@ -55,6 +55,24 @@ _ndbm_file_safety (mu_dbm_file_t db, int mode, uid_t owner)
return rc;
}
+#ifndef HAVE_DBM_PAGFNO
+# ifdef HAVE_DBM_DIRFNO
+# undef dbm_pagfno
+# define dbm_pagfno dbm_dirfno
+# else
+# error "neither dbm_pagfno nor dbm_dirfno available"
+# endif
+#endif
+
+#ifndef HAVE_DBM_DIRFNO
+# ifdef HAVE_DBM_PAGFNO
+# undef dbm_dirfno
+# define dbm_dirfno dbm_pagfno
+# else
+# error "neither dbm_pagfno nor dbm_dirfno available"
+# endif
+#endif
+
int
_ndbm_get_fd (mu_dbm_file_t db, int *pag, int *dir)
{
diff --git a/mail/mailvar.c b/mail/mailvar.c
index 3d1b178..c547069 100644
--- a/mail/mailvar.c
+++ b/mail/mailvar.c
@@ -343,15 +343,6 @@ mailvar_variable_comp (const void *a, const void *b)
return strcmp (v1->name, v2->name);
}
-static int
-mailvar_varptr_comp (const void *a, const void *b)
-{
- const struct mailvar_variable const * v1 = a;
- const struct mailvar_variable const *v2 = b;
-
- return strcmp (v1->name, v2->name);
-}
-
/* Find mailvar_list entry VAR. If not found and CREATE is not NULL, then
create the (unset and untyped) variable */
struct mailvar_variable *
@@ -631,7 +622,7 @@ mailvar_list_copy (int set)
if (!list)
mu_list_create (&list);
_mailvar_symbol_to_list (set, list);
- mu_list_sort (list, mailvar_varptr_comp);
+ mu_list_sort (list, mailvar_variable_comp);
return list;
}
diff --git a/mapi/Makefile.am b/mapi/Makefile.am
index 44ed4c6..fad64b4 100644
--- a/mapi/Makefile.am
+++ b/mapi/Makefile.am
@@ -24,7 +24,7 @@ lib_LTLIBRARIES = libmapi.la
/* FIXME: This should be part of the default includes. */
EXTRA_DIST = mapi.h
-libmapi_LDADD = ../lib/libmuaux.a ${MU_LIB_MAILUTILS}
+libmapi_LDADD = ../lib/libmuaux.la ${MU_LIB_MAILUTILS}
libmapi_la_SOURCES = \
MAPIAddress.c \
diff --git a/mh/Makefile.am b/mh/Makefile.am
index 45775e0..104c797 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -106,7 +106,7 @@ AM_CPPFLAGS =\
mh_LIBS = \
./libmh.a\
- ../lib/libmuaux.a\
+ ../lib/libmuaux.la\
${MU_LIB_MBOX}\
${MU_LIB_IMAP}\
${MU_LIB_POP}\
@@ -127,7 +127,7 @@ AM_YFLAGS=-vt
inc_LDADD = \
./libmh.a\
- ../lib/libmuaux.a\
+ ../lib/libmuaux.la\
../lib/libmuscript.a\
@LIBMU_SCM@ @address@hidden
@address@hidden
diff --git a/mh/prompter-tty.c b/mh/prompter-tty.c
index 0f60a34..b89b537 100644
--- a/mh/prompter-tty.c
+++ b/mh/prompter-tty.c
@@ -19,6 +19,7 @@
#include <mh.h>
#include "prompter.h"
#include "muaux.h"
+#include <signal.h>
#if HAVE_TERMIOS_H
# include <termios.h>
#endif
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index 97c4e80..9bd5fe9 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -73,7 +73,7 @@ popauth_LDADD = \
pop3d_DEPENDENCIES = \
@MU_AUTHLIBS_DEPENDENCY@ \
- ../lib/libmuaux.a \
+ ../lib/libmuaux.la \
${MU_LIB_MBOX}\
${MU_LIB_MH}\
${MU_LIB_MAILDIR}\
hooks/post-receive
--
GNU Mailutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Mailutils branch, master, updated. release-2.2-713-ga551d48,
Sergey Poznyakoff <=