summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2019-12-14 14:21:10 +0200
committerSergey Poznyakoff <gray@gnu.org>2019-12-14 14:36:27 +0200
commit06f5631f0d17f73e9b6f5bcf2663a8cb0db8e681 (patch)
treeb125289f2fc4720994fb277d11035d052d635897
parent23ab03e67910ea069c25a144378cf8de40d44a28 (diff)
downloadmailutils-06f5631f0d17f73e9b6f5bcf2663a8cb0db8e681.tar.gz
mailutils-06f5631f0d17f73e9b6f5bcf2663a8cb0db8e681.tar.bz2
Fix several linking issues
* configure.ac: Require libtool version 2.4.6 (MU_LINK_POSTFLAGS): Remove. Not needed with the patched version of ltmain.sh. Detect the presencecof GSSAPI. Fix displaying the status of GSSAPI support. Remove the hack introduced on 2010-02-19 (commit 35ac66f056). (MU_AUTHLIBS,SQLLIB) (SQL_LOADABLE_MODULES,SQL_LIBOBJS): Insert spaces only when needed. * mu-aux/ltmain.sh: ltmain.sh from libtool 2.4.6 with fixes from http://gray.gnu.org.ua/public/ltbug installed. * bootstrap.conf (bootstrap_epilogue): Install the fixed ltmain.sh version. * am/gssapi.m4: Allow for "yes" and "probe" argument values. Improve makefile style consistency . Uniformly use parentheses instead of curly braces in variable referencing; . Prefer to use Make variables over substitution variables, for variables prefixed with MU_; * comsat/Makefile.am * dotlock/Makefile.am * examples/Makefile.am * examples/cpp/Makefile.am * frm/Makefile.am * imap4d/Makefile.am * imap4d/tests/Makefile.am * lib/Makefile.am * libmailutils/Makefile.am * libmailutils/address/Makefile.am * libmailutils/auth/Makefile.am * libmailutils/base/Makefile.am * libmailutils/cfg/Makefile.am * libmailutils/cidr/Makefile.am * libmailutils/cli/Makefile.am * libmailutils/datetime/Makefile.am * libmailutils/diag/Makefile.am * libmailutils/filter/Makefile.am * libmailutils/imapio/Makefile.am * libmailutils/list/Makefile.am * libmailutils/locus/Makefile.am * libmailutils/mailbox/Makefile.am * libmailutils/mailcap/Makefile.am * libmailutils/mailer/Makefile.am * libmailutils/mime/Makefile.am * libmailutils/msgset/Makefile.am * libmailutils/opt/Makefile.am * libmailutils/property/Makefile.am * libmailutils/server/Makefile.am * libmailutils/sockaddr/Makefile.am * libmailutils/stdstream/Makefile.am * libmailutils/stream/Makefile.am * libmailutils/string/Makefile.am * libmailutils/tests/Makefile.am * libmailutils/url/Makefile.am * libmailutils/wicket/Makefile.am * libmu_auth/Makefile.am * libmu_cpp/Makefile.am * libmu_dbm/Makefile.am * libmu_scm/Makefile.am * libmu_scm/mailutils/Makefile.am * libmu_sieve/Makefile.am * libmu_sieve/extensions/Makefile.am * libproto/dotmail/Makefile.am * libproto/dotmail/tests/Makefile.am * libproto/imap/Makefile.am * libproto/imap/tests/Makefile.am * libproto/maildir/Makefile.am * libproto/mailer/Makefile.am * libproto/mbox/Makefile.am * libproto/mh/Makefile.am * libproto/nntp/Makefile.am * libproto/pop/Makefile.am * mail/Makefile.am * mapi/Makefile.am * mda/lib/Makefile.am * mda/lmtpd/Makefile.am * mda/mda/Makefile.am * mda/mda/tests/Makefile.am * mda/putmail/Makefile.am * messages/Makefile.am * mh/Makefile.am * mh/tests/Makefile.am * mimeview/Makefile.am * movemail/Makefile.am * mu/Makefile.am * mu/libexec/Makefile.am * pop3d/Makefile.am * python/2/libmu_py/Makefile.am * python/2/mailutils/Makefile.am * python/3/libmu_py/Makefile.am * python/3/mailutils/Makefile.am * readmsg/Makefile.am * sieve/Makefile.am * sql/Makefile.am * testsuite/Makefile.am
-rw-r--r--am/gssapi.m415
-rw-r--r--bootstrap.conf7
-rw-r--r--comsat/Makefile.am10
-rw-r--r--configure.ac67
-rw-r--r--dotlock/Makefile.am8
-rw-r--r--examples/Makefile.am82
-rw-r--r--examples/cpp/Makefile.am20
-rw-r--r--frm/Makefile.am15
-rw-r--r--imap4d/Makefile.am16
-rw-r--r--imap4d/tests/Makefile.am4
-rw-r--r--lib/Makefile.am6
-rw-r--r--libmailutils/Makefile.am2
-rw-r--r--libmailutils/address/Makefile.am2
-rw-r--r--libmailutils/auth/Makefile.am2
-rw-r--r--libmailutils/base/Makefile.am2
-rw-r--r--libmailutils/cfg/Makefile.am4
-rw-r--r--libmailutils/cidr/Makefile.am2
-rw-r--r--libmailutils/cli/Makefile.am2
-rw-r--r--libmailutils/datetime/Makefile.am4
-rw-r--r--libmailutils/diag/Makefile.am2
-rw-r--r--libmailutils/filter/Makefile.am2
-rw-r--r--libmailutils/imapio/Makefile.am2
-rw-r--r--libmailutils/list/Makefile.am2
-rw-r--r--libmailutils/locus/Makefile.am2
-rw-r--r--libmailutils/mailbox/Makefile.am2
-rw-r--r--libmailutils/mailcap/Makefile.am2
-rw-r--r--libmailutils/mailer/Makefile.am2
-rw-r--r--libmailutils/mime/Makefile.am2
-rw-r--r--libmailutils/msgset/Makefile.am2
-rw-r--r--libmailutils/opt/Makefile.am2
-rw-r--r--libmailutils/property/Makefile.am2
-rw-r--r--libmailutils/server/Makefile.am2
-rw-r--r--libmailutils/sockaddr/Makefile.am2
-rw-r--r--libmailutils/stdstream/Makefile.am2
-rw-r--r--libmailutils/stream/Makefile.am2
-rw-r--r--libmailutils/string/Makefile.am8
-rw-r--r--libmailutils/tests/Makefile.am4
-rw-r--r--libmailutils/url/Makefile.am2
-rw-r--r--libmailutils/wicket/Makefile.am2
-rw-r--r--libmu_auth/Makefile.am4
-rw-r--r--libmu_cpp/Makefile.am4
-rw-r--r--libmu_dbm/Makefile.am4
-rw-r--r--libmu_scm/Makefile.am8
-rw-r--r--libmu_scm/mailutils/Makefile.am2
-rw-r--r--libmu_sieve/Makefile.am8
-rw-r--r--libmu_sieve/extensions/Makefile.am4
-rw-r--r--libproto/dotmail/Makefile.am4
-rw-r--r--libproto/dotmail/tests/Makefile.am4
-rw-r--r--libproto/imap/Makefile.am4
-rw-r--r--libproto/imap/tests/Makefile.am10
-rw-r--r--libproto/maildir/Makefile.am4
-rw-r--r--libproto/mailer/Makefile.am4
-rw-r--r--libproto/mbox/Makefile.am4
-rw-r--r--libproto/mh/Makefile.am4
-rw-r--r--libproto/nntp/Makefile.am4
-rw-r--r--libproto/pop/Makefile.am4
-rw-r--r--mail/Makefile.am18
-rw-r--r--mapi/Makefile.am4
-rw-r--r--mda/lib/Makefile.am4
-rw-r--r--mda/lmtpd/Makefile.am26
-rw-r--r--mda/mda/Makefile.am26
-rw-r--r--mda/mda/tests/Makefile.am36
-rw-r--r--mda/putmail/Makefile.am27
-rw-r--r--messages/Makefile.am14
-rw-r--r--mh/Makefile.am32
-rw-r--r--mh/tests/Makefile.am2
-rw-r--r--mimeview/Makefile.am10
-rw-r--r--movemail/Makefile.am16
-rw-r--r--mu-aux/ltmain.sh11171
-rw-r--r--mu/Makefile.am6
-rw-r--r--mu/libexec/Makefile.am62
-rw-r--r--pop3d/Makefile.am26
-rw-r--r--python/2/libmu_py/Makefile.am18
-rw-r--r--python/2/mailutils/Makefile.am4
-rw-r--r--python/3/libmu_py/Makefile.am18
-rw-r--r--python/3/mailutils/Makefile.am4
-rw-r--r--readmsg/Makefile.am14
-rw-r--r--sieve/Makefile.am18
-rw-r--r--sql/Makefile.am2
-rw-r--r--testsuite/Makefile.am20
80 files changed, 11574 insertions, 402 deletions
diff --git a/am/gssapi.m4 b/am/gssapi.m4
index 8e4f5d709..ed25ddabf 100644
--- a/am/gssapi.m4
+++ b/am/gssapi.m4
@@ -14,11 +14,10 @@ AC_DEFUN([MU_CHECK_GSSAPI],
14 GSSAPI_PREFIX=[$1] 14 GSSAPI_PREFIX=[$1]
15 GSSAPI_IMPL="none" 15 GSSAPI_IMPL="none"
16 # First try krb5-config 16 # First try krb5-config
17 if test "$GSSAPI_PREFIX" != "yes"; then 17 case $GSSAPI_PREFIX in
18 krb5_path="$GSSAPI_PREFIX/bin" 18 yes|probe) krb5_path="$PATH";;
19 else 19 *) krb5_path="$GSSAPI_PREFIX/bin"
20 krb5_path="$PATH" 20 esac
21 fi
22 AC_PATH_PROG(KRB5CFGPATH, krb5-config, none, $krb5_path) 21 AC_PATH_PROG(KRB5CFGPATH, krb5-config, none, $krb5_path)
23 AC_CHECK_HEADER(gss.h, [wantgss=yes], [wantgss=no]) 22 AC_CHECK_HEADER(gss.h, [wantgss=yes], [wantgss=no])
24 if test $wantgss != no; then 23 if test $wantgss != no; then
@@ -47,12 +46,14 @@ int main() { return gss_check_version ("0.0.9") == (char*) 0; }],
47 saved_CPPFLAGS="$CPPFLAGS" 46 saved_CPPFLAGS="$CPPFLAGS"
48 saved_LDFLAGS="$LDFLAGS" 47 saved_LDFLAGS="$LDFLAGS"
49 saved_LIBS="$LIBS" 48 saved_LIBS="$LIBS"
50 if test "$GSSAPI_PREFIX" != "yes"; then 49 case $GSSAPI_PREFIX in
50 yes|probe) ;;
51 *)
51 GSSAPI_CFLAGS="-I$GSSAPI_PREFIX/include" 52 GSSAPI_CFLAGS="-I$GSSAPI_PREFIX/include"
52 GSSAPI_LDFLAGS="-L$GSSAPI_PREFIX/lib" 53 GSSAPI_LDFLAGS="-L$GSSAPI_PREFIX/lib"
53 CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" 54 CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
54 LDFLAGS="$LDFLAGS $GSSAPI_LDFLAGS" 55 LDFLAGS="$LDFLAGS $GSSAPI_LDFLAGS"
55 fi 56 esac
56 57
57 ## Check for new MIT kerberos V support 58 ## Check for new MIT kerberos V support
58 AC_CHECK_LIB(gssapi_krb5, gss_init_sec_context, 59 AC_CHECK_LIB(gssapi_krb5, gss_init_sec_context,
diff --git a/bootstrap.conf b/bootstrap.conf
index 361217c31..b6692e01f 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -113,3 +113,10 @@ if [ -z "$help" ]; then
113 #make -C doc/texinfo -f maint.mk 113 #make -C doc/texinfo -f maint.mk
114fi 114fi
115 115
116bootstrap_epilogue() {
117 # Install a ltmain.sh version that fixes the two libtool issues we've
118 # encountered.
119 # See http://gray.gnu.org.ua/public/ltbug for details.
120 set -e
121 (cd build-aux && rm ltmain.sh && ln -s ../mu-aux/ltmain.sh)
122}
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index 5d124c521..b17c5318c 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -19,7 +19,7 @@ sbin_PROGRAMS = comsatd
19 19
20comsatd_SOURCES = action.c comsat.c comsat.h biff.rc.h 20comsatd_SOURCES = action.c comsat.c comsat.h biff.rc.h
21AM_CPPFLAGS = \ 21AM_CPPFLAGS = \
22 @MU_APP_COMMON_INCLUDES@\ 22 $(MU_APP_COMMON_INCLUDES)\
23 -DSYSCONFDIR=\"$(sysconfdir)\" 23 -DSYSCONFDIR=\"$(sysconfdir)\"
24 24
25BUILT_SOURCES=biff.rc.h 25BUILT_SOURCES=biff.rc.h
@@ -30,8 +30,8 @@ biff.rc.h: $(top_srcdir)/comsat/biff.rc
30 $(top_srcdir)/comsat/biff.rc > biff.rc.h 30 $(top_srcdir)/comsat/biff.rc > biff.rc.h
31 31
32comsatd_LDADD = \ 32comsatd_LDADD = \
33 ${MU_APP_LIBRARIES}\ 33 $(MU_LIB_MAILBOX)\
34 ${MU_LIB_MAILBOX}\ 34 $(MU_LIB_MAILUTILS)\
35 ${MU_LIB_MAILUTILS}\ 35 $(MU_APP_LIBRARIES)\
36 @MU_COMMON_LIBRARIES@ 36 $(MU_COMMON_LIBRARIES)
37 37
diff --git a/configure.ac b/configure.ac
index 59b9fe777..575ff22f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,11 +76,11 @@ gl_EARLY
76AC_PROG_CXX 76AC_PROG_CXX
77AC_PROG_INSTALL 77AC_PROG_INSTALL
78AC_PROG_LN_S 78AC_PROG_LN_S
79AC_LIBTOOL_DLOPEN
80AC_PROG_LIBTOOL
81MU_PROG_BISON