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

28 files changed, 34 insertions, 34 deletions

diff --git a/libmailutils/Makefile.am b/libmailutils/Makefile.am
index 71bcda298..d8b34c63b 100644
--- a/libmailutils/Makefile.am
+++ b/libmailutils/Makefile.am
@@ -50,7 +50,7 @@ lib_LTLIBRARIES = libmailutils.la
 libmailutils_la_SOURCES =  
 
 libmailutils_la_LIBADD = \
- @MU_COMMON_LIBRARIES@\
+ $(MU_COMMON_LIBRARIES)\
  auth/libauth.la\
  base/libbase.la\
  address/libaddress.la\
diff --git a/libmailutils/address/Makefile.am b/libmailutils/address/Makefile.am
index 671d2615a..e839774d3 100644
--- a/libmailutils/address/Makefile.am
+++ b/libmailutils/address/Makefile.am
@@ -22,4 +22,4 @@ libaddress_la_SOURCES = \
  addrstream.c\
  parse822.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/auth/Makefile.am b/libmailutils/auth/Makefile.am
index 7d8544083..2d74d015c 100644
--- a/libmailutils/auth/Makefile.am
+++ b/libmailutils/auth/Makefile.am
@@ -22,4 +22,4 @@ libauth_la_SOURCES = \
  mu_auth.c\
  system.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/base/Makefile.am b/libmailutils/base/Makefile.am
index e641f1dc0..db8da73b0 100644
--- a/libmailutils/base/Makefile.am
+++ b/libmailutils/base/Makefile.am
@@ -74,7 +74,7 @@ libbase_la_SOURCES = \
 
 localedir = $(datadir)/locale
 AM_CPPFLAGS = \
-  @MU_LIB_COMMON_INCLUDES@ -I/libmailutils\
+  $(MU_LIB_COMMON_INCLUDES) -I/libmailutils\
  -DSYSCONFDIR=\"$(sysconfdir)\"\
  -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
  -DLOCALEDIR=\"$(localedir)\"
diff --git a/libmailutils/cfg/Makefile.am b/libmailutils/cfg/Makefile.am
index aad631d29..6f112d839 100644
--- a/libmailutils/cfg/Makefile.am
+++ b/libmailutils/cfg/Makefile.am
@@ -25,7 +25,7 @@ libcfg_la_SOURCES = \
 
 localedir = $(datadir)/locale
 AM_CPPFLAGS = \
- @MU_LIB_COMMON_INCLUDES@ -I/libmailutils\
+ $(MU_LIB_COMMON_INCLUDES) -I/libmailutils\
  -DSYSCONFDIR=\"$(sysconfdir)\"\
  -DLOCALEDIR=\"$(localedir)\"
 
@@ -37,7 +37,7 @@ EXTRA_DIST = \
 
 BUILT_SOURCES = parser.c parser.h lexer.c
 
-YLWRAP = @MU_YLWRAP@
+YLWRAP = $(MU_YLWRAP)
 AM_YFLAGS=-vdt
 AM_LFLAGS=-dp
 
diff --git a/libmailutils/cidr/Makefile.am b/libmailutils/cidr/Makefile.am
index 40887a552..9edce6e5b 100644
--- a/libmailutils/cidr/Makefile.am
+++ b/libmailutils/cidr/Makefile.am
@@ -24,4 +24,4 @@ libcidr_la_SOURCES = \
  tosa.c\
  tostr.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/cli/Makefile.am b/libmailutils/cli/Makefile.am
index db5540e15..d1bb90040 100644
--- a/libmailutils/cli/Makefile.am
+++ b/libmailutils/cli/Makefile.am
@@ -24,4 +24,4 @@ libcli_la_SOURCES = \
  stdcapa.c
 
 AM_CPPFLAGS = \
-  @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+  $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/datetime/Makefile.am b/libmailutils/datetime/Makefile.am
index 2cc68df91..1b6f24603 100644
--- a/libmailutils/datetime/Makefile.am
+++ b/libmailutils/datetime/Makefile.am
@@ -32,6 +32,6 @@ libdatetime_la_SOURCES = \
  utcoff.c\
  yd.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
-YLWRAP = @MU_YLWRAP@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
+YLWRAP = $(MU_YLWRAP)
 EXTRA_DIST = gylwrap.conf
diff --git a/libmailutils/diag/Makefile.am b/libmailutils/diag/Makefile.am
index 666a0baed..6e4c99ea8 100644
--- a/libmailutils/diag/Makefile.am
+++ b/libmailutils/diag/Makefile.am
@@ -26,7 +26,7 @@ libdiag_la_SOURCES = \
  syslog.c\
  wd.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
 
 EXTRA_DIST = \
  debcat\
diff --git a/libmailutils/filter/Makefile.am b/libmailutils/filter/Makefile.am
index 223c1e908..8d83a8b2d 100644
--- a/libmailutils/filter/Makefile.am
+++ b/libmailutils/filter/Makefile.am
@@ -39,5 +39,5 @@ libfilter_la_SOURCES =\
  qpflt.c\
  xml.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I$(top_srcdir)/libmailutils
 
diff --git a/libmailutils/imapio/Makefile.am b/libmailutils/imapio/Makefile.am
index f501a21c7..e7bbb75a4 100644
--- a/libmailutils/imapio/Makefile.am
+++ b/libmailutils/imapio/Makefile.am
@@ -40,5 +40,5 @@ libimapio_la_SOURCES = \
  words.c\
  xscript.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
 
diff --git a/libmailutils/list/Makefile.am b/libmailutils/list/Makefile.am
index efcac5c57..61af870e3 100644
--- a/libmailutils/list/Makefile.am
+++ b/libmailutils/list/Makefile.am
@@ -52,5 +52,5 @@ liblist_la_SOURCES = \
  sort.c\
  tail.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
 
diff --git a/libmailutils/locus/Makefile.am b/libmailutils/locus/Makefile.am
index 7bf9b4a03..fdedc9385 100644
--- a/libmailutils/locus/Makefile.am
+++ b/libmailutils/locus/Makefile.am
@@ -27,5 +27,5 @@ liblocus_la_SOURCES = \
 
 EXTRA_DIST = genprloc.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
 
diff --git a/libmailutils/mailbox/Makefile.am b/libmailutils/mailbox/Makefile.am
index edf01cf84..8cab0f169 100644
--- a/libmailutils/mailbox/Makefile.am
+++ b/libmailutils/mailbox/Makefile.am
@@ -56,4 +56,4 @@ libmailbox_la_SOURCES =  \
  msguid.c\
  msguidl.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/mailcap/Makefile.am b/libmailutils/mailcap/Makefile.am
index 20e86682d..7e3719042 100644
--- a/libmailutils/mailcap/Makefile.am
+++ b/libmailutils/mailcap/Makefile.am
@@ -39,4 +39,4 @@ libmailcap_la_SOURCES = \
  parse.c\
  parsefile.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/mailer/Makefile.am b/libmailutils/mailer/Makefile.am
index 6aca0e892..358e85cd1 100644
--- a/libmailutils/mailer/Makefile.am
+++ b/libmailutils/mailer/Makefile.am
@@ -21,4 +21,4 @@ libmailer_la_SOURCES = \
  mailer.c\
  progmailer.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/mime/Makefile.am b/libmailutils/mime/Makefile.am
index b71b07c62..adb98f99f 100644
--- a/libmailutils/mime/Makefile.am
+++ b/libmailutils/mime/Makefile.am
@@ -23,4 +23,4 @@ libmime_la_SOURCES = \
  mimehdr.c\
  mimehdrset.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/msgset/Makefile.am b/libmailutils/msgset/Makefile.am
index 5f55667b6..b74488eb0 100644
--- a/libmailutils/msgset/Makefile.am
+++ b/libmailutils/msgset/Makefile.am
@@ -44,5 +44,5 @@ libmsgset_la_SOURCES = \
  subset.c\
  trans.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
 
diff --git a/libmailutils/opt/Makefile.am b/libmailutils/opt/Makefile.am
index 35856fe8e..4fb54d494 100644
--- a/libmailutils/opt/Makefile.am
+++ b/libmailutils/opt/Makefile.am
@@ -23,4 +23,4 @@ libopt_la_SOURCES = \
  progname.c
 
 AM_CPPFLAGS = \
-  @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+  $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/property/Makefile.am b/libmailutils/property/Makefile.am
index 6863f3b4a..33d61a288 100644
--- a/libmailutils/property/Makefile.am
+++ b/libmailutils/property/Makefile.am
@@ -27,4 +27,4 @@ libproperty_la_SOURCES = \
  propinv.c\
  propset.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/server/Makefile.am b/libmailutils/server/Makefile.am
index 8e12a1cba..6aca7e423 100644
--- a/libmailutils/server/Makefile.am
+++ b/libmailutils/server/Makefile.am
@@ -24,4 +24,4 @@ libserver_la_SOURCES = \
  ipsrv.c\
  sid.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/sockaddr/Makefile.am b/libmailutils/sockaddr/Makefile.am
index 087509ba2..a3e901004 100644
--- a/libmailutils/sockaddr/Makefile.am
+++ b/libmailutils/sockaddr/Makefile.am
@@ -29,4 +29,4 @@ libsockaddr_la_SOURCES = \
  unlink.c\
  url.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/stdstream/Makefile.am b/libmailutils/stdstream/Makefile.am
index aa2d73191..f8a54c14f 100644
--- a/libmailutils/stdstream/Makefile.am
+++ b/libmailutils/stdstream/Makefile.am
@@ -22,4 +22,4 @@ libstdstream_la_SOURCES = \
  dbgstream.c\
  strerr.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/stream/Makefile.am b/libmailutils/stream/Makefile.am
index 2c2c396f9..075de2cbe 100644
--- a/libmailutils/stream/Makefile.am
+++ b/libmailutils/stream/Makefile.am
@@ -42,4 +42,4 @@ libstream_la_SOURCES = \
  wordwrap.c\
  xscript-stream.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
diff --git a/libmailutils/string/Makefile.am b/libmailutils/string/Makefile.am
index 24557717a..d7b1eef40 100644
--- a/libmailutils/string/Makefile.am
+++ b/libmailutils/string/Makefile.am
@@ -51,7 +51,7 @@ libstring_la_SOURCES = \
 EXTRA_DIST=to_sn.c to_un.c
 
 AM_CPPFLAGS = \
- @MU_LIB_COMMON_INCLUDES@\
- -I${srcdir}\
- -I${top_srcdir}/libmailutils\
- -I${top_srcdir}/libmailutils/wordsplit
+ $(MU_LIB_COMMON_INCLUDES)\
+ -I$(srcdir)\
+ -I$(top_srcdir)/libmailutils\
+ -I$(top_srcdir)/libmailutils/wordsplit
diff --git a/libmailutils/tests/Makefile.am b/libmailutils/tests/Makefile.am
index 64cba2b97..f0f7ff034 100644
--- a/libmailutils/tests/Makefile.am
+++ b/libmailutils/tests/Makefile.am
@@ -21,7 +21,7 @@ AUTOTEST_INCLUDES += -I $(top_srcdir)/libmailutils/wordsplit
 ## Non-installable programs
 ## -------------------------- ##
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES)
 
 noinst_LTLIBRARIES = libmu_tesh.la
 libmu_tesh_la_SOURCES = tesh.c tesh.h
@@ -76,7 +76,7 @@ linetrack_LDADD = libmu_tesh.la $(LDADD)
 
 listop_LDADD = libmu_tesh.la $(LDADD)
 
-LDADD = ${MU_LIB_MAILUTILS}
+LDADD = $(MU_LIB_MAILUTILS)
 
 EXTRA_DIST += Encode Decode Wicketfile
 
diff --git a/libmailutils/url/Makefile.am b/libmailutils/url/Makefile.am
index 7fd95d3db..0cb1436d8 100644
--- a/libmailutils/url/Makefile.am
+++ b/libmailutils/url/Makefile.am
@@ -55,5 +55,5 @@ liburl_la_SOURCES = \
  urlinv.c\
  urlstr.c
 
-AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+AM_CPPFLAGS = $(MU_LIB_COMMON_INCLUDES) -I/libmailutils
 
diff --git a/libmailutils/wicket/Makefile.am b/libmailutils/wicket/Makefile.am
index b7f352879..b597fe4ab 100644
--- a/libmailutils/wicket/Makefile.am
+++ b/libmailutils/wicket/Makefile.am
@@ -22,7 +22,7 @@ libwicket_la_SOURCES = \
 
 localedir = $(datadir)/locale
 AM_CPPFLAGS = \
-  @MU_LIB_COMMON_INCLUDES@ -I/libmailutils\
+  $(MU_LIB_COMMON_INCLUDES) -I/libmailutils\
  -DSYSCONFDIR=\"$(sysconfdir)\"\
  -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
  -DLOCALEDIR=\"$(localedir)\"