diff options
Diffstat (limited to 'mail/dbmail22/files/patch-2.0.7_007')
| -rw-r--r-- | mail/dbmail22/files/patch-2.0.7_007 | 9108 |
1 files changed, 0 insertions, 9108 deletions
diff --git a/mail/dbmail22/files/patch-2.0.7_007 b/mail/dbmail22/files/patch-2.0.7_007 deleted file mode 100644 index 6d221a2ef59f..000000000000 --- a/mail/dbmail22/files/patch-2.0.7_007 +++ /dev/null @@ -1,9108 +0,0 @@ ---- Makefile.in (revision 1905) -+++ Makefile.in (revision 1948) -@@ -1,6 +1,8 @@ --# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -+# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# @configure_input@ - --# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,6 +12,8 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - -+@SET_MAKE@ -+ - # Copyright (C) 1999-2004 IC & S dbmail@ic-s.nl - # - # This program is free software; you can redistribute it and/or -@@ -28,86 +32,209 @@ - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - --SHELL = @SHELL@ -- - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include -- --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -- - top_builddir = . -- --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --transform = @program_transform_name@ -- -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ -+build_triplet = @build@ - host_triplet = @host@ -+bin_PROGRAMS = $(am__EXEEXT_1) -+sbin_PROGRAMS = dbmail-smtp$(EXEEXT) dbmail-pop3d$(EXEEXT) \ -+ dbmail-imapd$(EXEEXT) dbmail-util$(EXEEXT) \ -+ dbmail-users$(EXEEXT) dbmail-lmtpd$(EXEEXT) -+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(srcdir)/config.in \ -+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ -+ THANKS TODO buildtools/config.guess buildtools/config.sub \ -+ buildtools/depcomp buildtools/install-sh buildtools/ltmain.sh \ -+ buildtools/missing buildtools/mkinstalldirs -+subdir = . -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -+ configure.lineno configure.status.lineno -+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs -+CONFIG_HEADER = config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+libdbmail_la_DEPENDENCIES = -+am__libdbmail_la_SOURCES_DIST = config.c debug.c list.c dbmd5.c md5.c \ -+ db.c misc.c mime.c pidfile.c dm_getopt.c server.c \ -+ serverchild.c pool.c header.c pipe.c forward.c dsn.c -+@USE_DM_GETOPT_TRUE@am__objects_1 = dm_getopt.lo -+am__objects_2 = config.lo debug.lo list.lo dbmd5.lo md5.lo db.lo \ -+ misc.lo mime.lo pidfile.lo $(am__objects_1) -+am__objects_3 = server.lo serverchild.lo pool.lo -+am__objects_4 = header.lo pipe.lo forward.lo dsn.lo -+am_libdbmail_la_OBJECTS = $(am__objects_2) $(am__objects_3) \ -+ $(am__objects_4) -+libdbmail_la_OBJECTS = $(am_libdbmail_la_OBJECTS) -+@SIEVE_TRUE@am__EXEEXT_1 = dbmail-sievecmd$(EXEEXT) \ -+@SIEVE_TRUE@ dbmail-timsieved$(EXEEXT) -+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" -+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -+sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) -+am_dbmail_imapd_OBJECTS = quota.$(OBJEXT) imap4.$(OBJEXT) \ -+ imaputil.$(OBJEXT) imapcommands.$(OBJEXT) memblock.$(OBJEXT) \ -+ rfcmsg.$(OBJEXT) imapd.$(OBJEXT) dbsearch.$(OBJEXT) \ -+ dbmsgbuf.$(OBJEXT) acl.$(OBJEXT) -+dbmail_imapd_OBJECTS = $(am_dbmail_imapd_OBJECTS) -+dbmail_imapd_DEPENDENCIES = libdbmail.la -+am_dbmail_lmtpd_OBJECTS = lmtp.$(OBJEXT) lmtpd.$(OBJEXT) -+dbmail_lmtpd_OBJECTS = $(am_dbmail_lmtpd_OBJECTS) -+dbmail_lmtpd_DEPENDENCIES = libdbmail.la -+am_dbmail_pop3d_OBJECTS = pop3.$(OBJEXT) pop3d.$(OBJEXT) -+dbmail_pop3d_OBJECTS = $(am_dbmail_pop3d_OBJECTS) -+dbmail_pop3d_DEPENDENCIES = libdbmail.la -+am__dbmail_sievecmd_SOURCES_DIST = sievecmd.c -+@SIEVE_TRUE@am_dbmail_sievecmd_OBJECTS = sievecmd.$(OBJEXT) -+dbmail_sievecmd_OBJECTS = $(am_dbmail_sievecmd_OBJECTS) -+@SIEVE_TRUE@dbmail_sievecmd_DEPENDENCIES = libdbmail.la -+am_dbmail_smtp_OBJECTS = main.$(OBJEXT) -+dbmail_smtp_OBJECTS = $(am_dbmail_smtp_OBJECTS) -+dbmail_smtp_DEPENDENCIES = libdbmail.la -+am__dbmail_timsieved_SOURCES_DIST = timsieve.c timsieved.c -+@SIEVE_TRUE@am_dbmail_timsieved_OBJECTS = timsieve.$(OBJEXT) \ -+@SIEVE_TRUE@ timsieved.$(OBJEXT) -+dbmail_timsieved_OBJECTS = $(am_dbmail_timsieved_OBJECTS) -+@SIEVE_TRUE@dbmail_timsieved_DEPENDENCIES = libdbmail.la -+am_dbmail_users_OBJECTS = user.$(OBJEXT) -+dbmail_users_OBJECTS = $(am_dbmail_users_OBJECTS) -+dbmail_users_DEPENDENCIES = libdbmail.la -+am_dbmail_util_OBJECTS = maintenance.$(OBJEXT) -+dbmail_util_OBJECTS = $(am_dbmail_util_OBJECTS) -+dbmail_util_DEPENDENCIES = libdbmail.la -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -+depcomp = $(SHELL) $(top_srcdir)/buildtools/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+SOURCES = $(libdbmail_la_SOURCES) $(dbmail_imapd_SOURCES) \ -+ $(dbmail_lmtpd_SOURCES) $(dbmail_pop3d_SOURCES) \ -+ $(dbmail_sievecmd_SOURCES) $(dbmail_smtp_SOURCES) \ -+ $(dbmail_timsieved_SOURCES) $(dbmail_users_SOURCES) \ -+ $(dbmail_util_SOURCES) -+DIST_SOURCES = $(am__libdbmail_la_SOURCES_DIST) \ -+ $(dbmail_imapd_SOURCES) $(dbmail_lmtpd_SOURCES) \ -+ $(dbmail_pop3d_SOURCES) $(am__dbmail_sievecmd_SOURCES_DIST) \ -+ $(dbmail_smtp_SOURCES) $(am__dbmail_timsieved_SOURCES_DIST) \ -+ $(dbmail_users_SOURCES) $(dbmail_util_SOURCES) -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-exec-recursive install-info-recursive \ -+ install-recursive installcheck-recursive installdirs-recursive \ -+ pdf-recursive ps-recursive uninstall-info-recursive \ -+ uninstall-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+distdir = $(PACKAGE)-$(VERSION) -+top_distdir = $(distdir) -+am__remove_distdir = \ -+ { test ! -d $(distdir) \ -+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -fr $(distdir); }; } -+DIST_ARCHIVES = $(distdir).tar.gz -+GZIP_ENV = --best -+distuninstallcheck_listfiles = find . -type f -print -+distcleancheck_listfiles = find . -type f -print -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ -+AMTAR = @AMTAR@ - AR = @AR@ --AS = @AS@ - AUTHALIB = @AUTHALIB@ - AUTHLTLIB = @AUTHLTLIB@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ --DLLTOOL = @DLLTOOL@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - EXEEXT = @EXEEXT@ - F77 = @F77@ --GCJ = @GCJ@ --GCJFLAGS = @GCJFLAGS@ --HAVE_LIB = @HAVE_LIB@ -+FFLAGS = @FFLAGS@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDAPINC = @LDAPINC@ - LDAPLIB = @LDAPLIB@ --LIB = @LIB@ -+LDAP_FALSE = @LDAP_FALSE@ -+LDAP_TRUE = @LDAP_TRUE@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --LTLIB = @LTLIB@ -+LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MYSQLINC = @MYSQLINC@ --OBJDUMP = @OBJDUMP@ -+MYSQL_FALSE = @MYSQL_FALSE@ -+MYSQL_TRUE = @MYSQL_TRUE@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - PGSQLINC = @PGSQLINC@ -+PGSQL_FALSE = @PGSQL_FALSE@ -+PGSQL_TRUE = @PGSQL_TRUE@ - RANLIB = @RANLIB@ --RC = @RC@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - SIEVEINC = @SIEVEINC@ - SIEVELIB = @SIEVELIB@ -+SIEVE_FALSE = @SIEVE_FALSE@ -+SIEVE_TRUE = @SIEVE_TRUE@ - SORTALIB = @SORTALIB@ - SORTLTLIB = @SORTLTLIB@ - SQLALIB = @SQLALIB@ -@@ -115,343 +242,318 @@ - SQLLTLIB = @SQLLTLIB@ - STRIP = @STRIP@ - USE_DM_GETOPT = @USE_DM_GETOPT@ -+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@ -+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+datadir = @datadir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ - mysqlconfig = @mysqlconfig@ -+oldincludedir = @oldincludedir@ - pgsqlconfig = @pgsqlconfig@ -- -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ - SUBDIRS = mysql pgsql auth sort man -- - @SIEVE_TRUE@SIEVEPROGS = dbmail-sievecmd dbmail-timsieved -- - @USE_DM_GETOPT_TRUE@DM_GETOPT = dm_getopt.c -- --bin_PROGRAMS = $(SIEVEPROGS) --sbin_PROGRAMS = dbmail-smtp dbmail-pop3d dbmail-imapd dbmail-util dbmail-users dbmail-lmtpd -- - COMMON = config.c debug.c list.c dbmd5.c md5.c db.c misc.c mime.c pidfile.c $(DM_GETOPT) - SERVER = server.c serverchild.c pool.c - DELIVER = header.c pipe.c forward.c dsn.c - - # CFLAGS - AM_CFLAGS = -fomit-frame-pointer -- - dbmail_smtp_SOURCES = main.c --dbmail_smtp_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @SIEVELIB@ -- -+dbmail_smtp_LDADD = libdbmail.la - dbmail_pop3d_SOURCES = pop3.c pop3d.c --dbmail_pop3d_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ -- -+dbmail_pop3d_LDADD = libdbmail.la - dbmail_imapd_SOURCES = quota.c imap4.c imaputil.c imapcommands.c memblock.c rfcmsg.c imapd.c dbsearch.c dbmsgbuf.c acl.c --dbmail_imapd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ -- -+dbmail_imapd_LDADD = libdbmail.la - dbmail_util_SOURCES = maintenance.c --dbmail_util_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ -- -+dbmail_util_LDADD = libdbmail.la - dbmail_users_SOURCES = user.c --dbmail_users_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ -- -+dbmail_users_LDADD = libdbmail.la - dbmail_lmtpd_SOURCES = lmtp.c lmtpd.c --dbmail_lmtpd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ -- -+dbmail_lmtpd_LDADD = libdbmail.la - @SIEVE_TRUE@dbmail_sievecmd_SOURCES = sievecmd.c --@SIEVE_TRUE@dbmail_sievecmd_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ -- -+@SIEVE_TRUE@dbmail_sievecmd_LDADD = libdbmail.la - @SIEVE_TRUE@dbmail_timsieved_SOURCES = timsieve.c timsieved.c --@SIEVE_TRUE@dbmail_timsieved_LDADD = libdbmail.la @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ -- --lib_LTLIBRARIES = libdbmail.la -+@SIEVE_TRUE@dbmail_timsieved_LDADD = libdbmail.la -+noinst_LTLIBRARIES = libdbmail.la - libdbmail_la_SOURCES = $(COMMON) $(SERVER) $(DELIVER) --libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ @SQLLIB@ @LDAPLIB@ @SIEVELIB@ --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs --CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(lib_LTLIBRARIES) -+libdbmail_la_LIBADD = @SQLLTLIB@ @SORTLTLIB@ @AUTHLTLIB@ -+all: config.h -+ $(MAKE) $(AM_MAKEFLAGS) all-recursive - -- --DEFS = @DEFS@ -I. -I$(srcdir) -I. --CPPFLAGS = @CPPFLAGS@ --LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ --libdbmail_la_LDFLAGS = --libdbmail_la_DEPENDENCIES = --@USE_DM_GETOPT_FALSE@libdbmail_la_OBJECTS = config.lo debug.lo list.lo \ --@USE_DM_GETOPT_FALSE@dbmd5.lo md5.lo db.lo misc.lo mime.lo pidfile.lo \ --@USE_DM_GETOPT_FALSE@server.lo serverchild.lo pool.lo header.lo pipe.lo \ --@USE_DM_GETOPT_FALSE@forward.lo dsn.lo --@USE_DM_GETOPT_TRUE@libdbmail_la_OBJECTS = config.lo debug.lo list.lo \ --@USE_DM_GETOPT_TRUE@dbmd5.lo md5.lo db.lo misc.lo mime.lo pidfile.lo \ --@USE_DM_GETOPT_TRUE@dm_getopt.lo server.lo serverchild.lo pool.lo \ --@USE_DM_GETOPT_TRUE@header.lo pipe.lo forward.lo dsn.lo --@SIEVE_FALSE@bin_PROGRAMS = --@SIEVE_TRUE@bin_PROGRAMS = dbmail-sievecmd$(EXEEXT) \ --@SIEVE_TRUE@dbmail-timsieved$(EXEEXT) --sbin_PROGRAMS = dbmail-smtp$(EXEEXT) dbmail-pop3d$(EXEEXT) \ --dbmail-imapd$(EXEEXT) dbmail-util$(EXEEXT) dbmail-users$(EXEEXT) \ --dbmail-lmtpd$(EXEEXT) --PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) -- --@SIEVE_TRUE@dbmail_sievecmd_OBJECTS = sievecmd.$(OBJEXT) --@SIEVE_TRUE@dbmail_sievecmd_DEPENDENCIES = libdbmail.la --dbmail_sievecmd_LDFLAGS = --@SIEVE_TRUE@dbmail_timsieved_OBJECTS = timsieve.$(OBJEXT) \ --@SIEVE_TRUE@timsieved.$(OBJEXT) --@SIEVE_TRUE@dbmail_timsieved_DEPENDENCIES = libdbmail.la --dbmail_timsieved_LDFLAGS = --dbmail_smtp_OBJECTS = main.$(OBJEXT) --dbmail_smtp_DEPENDENCIES = libdbmail.la --dbmail_smtp_LDFLAGS = --dbmail_pop3d_OBJECTS = pop3.$(OBJEXT) pop3d.$(OBJEXT) --dbmail_pop3d_DEPENDENCIES = libdbmail.la --dbmail_pop3d_LDFLAGS = --dbmail_imapd_OBJECTS = quota.$(OBJEXT) imap4.$(OBJEXT) \ --imaputil.$(OBJEXT) imapcommands.$(OBJEXT) memblock.$(OBJEXT) \ --rfcmsg.$(OBJEXT) imapd.$(OBJEXT) dbsearch.$(OBJEXT) dbmsgbuf.$(OBJEXT) \ --acl.$(OBJEXT) --dbmail_imapd_DEPENDENCIES = libdbmail.la --dbmail_imapd_LDFLAGS = --dbmail_util_OBJECTS = maintenance.$(OBJEXT) --dbmail_util_DEPENDENCIES = libdbmail.la --dbmail_util_LDFLAGS = --dbmail_users_OBJECTS = user.$(OBJEXT) --dbmail_users_DEPENDENCIES = libdbmail.la --dbmail_users_LDFLAGS = --dbmail_lmtpd_OBJECTS = lmtp.$(OBJEXT) lmtpd.$(OBJEXT) --dbmail_lmtpd_DEPENDENCIES = libdbmail.la --dbmail_lmtpd_LDFLAGS = --CFLAGS = @CFLAGS@ --COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ --DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ --Makefile.am Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 \ --config.in configure configure.in -- -- --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -- --TAR = tar --GZIP_ENV = --best --DEP_FILES = .deps/acl.P .deps/config.P .deps/db.P .deps/dbmd5.P \ --.deps/dbmsgbuf.P .deps/dbsearch.P .deps/debug.P .deps/dm_getopt.P \ --.deps/dsn.P .deps/forward.P .deps/header.P .deps/imap4.P \ --.deps/imapcommands.P .deps/imapd.P .deps/imaputil.P .deps/list.P \ --.deps/lmtp.P .deps/lmtpd.P .deps/main.P .deps/maintenance.P .deps/md5.P \ --.deps/memblock.P .deps/mime.P .deps/misc.P .deps/pidfile.P .deps/pipe.P \ --.deps/pool.P .deps/pop3.P .deps/pop3d.P .deps/quota.P .deps/rfcmsg.P \ --.deps/server.P .deps/serverchild.P .deps/sievecmd.P .deps/timsieve.P \ --.deps/timsieved.P .deps/user.P --SOURCES = $(libdbmail_la_SOURCES) $(dbmail_sievecmd_SOURCES) $(dbmail_timsieved_SOURCES) $(dbmail_smtp_SOURCES) $(dbmail_pop3d_SOURCES) $(dbmail_imapd_SOURCES) $(dbmail_util_SOURCES) $(dbmail_users_SOURCES) $(dbmail_lmtpd_SOURCES) --OBJECTS = $(libdbmail_la_OBJECTS) $(dbmail_sievecmd_OBJECTS) $(dbmail_timsieved_OBJECTS) $(dbmail_smtp_OBJECTS) $(dbmail_pop3d_OBJECTS) $(dbmail_imapd_OBJECTS) $(dbmail_util_OBJECTS) $(dbmail_users_OBJECTS) $(dbmail_lmtpd_OBJECTS) -- --all: all-redirect - .SUFFIXES: --.SUFFIXES: .S .c .lo .o .obj .s --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile -+.SUFFIXES: .c .lo .o .obj -+am--refresh: -+ @: -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ -+ cd $(srcdir) && $(AUTOMAKE) --gnu \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --gnu Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ echo ' $(SHELL) ./config.status'; \ -+ $(SHELL) ./config.status;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ -+ esac; - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) -- cd $(top_builddir) \ -- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ $(SHELL) ./config.status --recheck - --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 -- cd $(srcdir) && $(ACLOCAL) -- --config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- $(SHELL) ./config.status --recheck --$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - --config.h: stamp-h -+config.h: stamp-h1 - @if test ! -f $@; then \ -- rm -f stamp-h; \ -- $(MAKE) stamp-h; \ -+ rm -f stamp-h1; \ -+ $(MAKE) stamp-h1; \ - else :; fi --stamp-h: $(srcdir)/config.in $(top_builddir)/config.status -- cd $(top_builddir) \ -- && CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \ -- $(SHELL) ./config.status -- @echo timestamp > stamp-h 2> /dev/null --$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in -- @if test ! -f $@; then \ -- rm -f $(srcdir)/stamp-h.in; \ -- $(MAKE) $(srcdir)/stamp-h.in; \ -- else :; fi --$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) -+ -+stamp-h1: $(srcdir)/config.in $(top_builddir)/config.status -+ @rm -f stamp-h1 -+ cd $(top_builddir) && $(SHELL) ./config.status config.h -+$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) -- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null -+ rm -f stamp-h1 -+ touch $@ - --mostlyclean-hdr: -- --clean-hdr: -- - distclean-hdr: -- -rm -f config.h -+ -rm -f config.h stamp-h1 - --maintainer-clean-hdr: -- --mostlyclean-libLTLIBRARIES: -- --clean-libLTLIBRARIES: -- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) -- --distclean-libLTLIBRARIES: -- --maintainer-clean-libLTLIBRARIES: -- --install-libLTLIBRARIES: $(lib_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libdir) -- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ -- $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ -- else :; fi; \ -+clean-noinstLTLIBRARIES: -+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) -+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ -+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -+ test "$$dir" != "$$p" || dir=.; \ -+ echo "rm -f \"$${dir}/so_locations\""; \ -+ rm -f "$${dir}/so_locations"; \ - done -- --uninstall-libLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ -- done -- --# FIXME: We should only use cygpath when building on Windows, --# and only if it is available. --.c.obj: -- $(COMPILE) -c `cygpath -w $<` -- --.s.o: -- $(COMPILE) -c $< -- --.S.o: -- $(COMPILE) -c $< -- --mostlyclean-compile: -- -rm -f *.o core *.core -- -rm -f *.$(OBJEXT) -- --clean-compile: -- --distclean-compile: -- -rm -f *.tab.c -- --maintainer-clean-compile: -- --.s.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --.S.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- --maintainer-clean-libtool: -- --libdbmail.la: $(libdbmail_la_OBJECTS) $(libdbmail_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libdbmail_la_LDFLAGS) $(libdbmail_la_OBJECTS) $(libdbmail_la_LIBADD) $(LIBS) -- --mostlyclean-binPROGRAMS: -- --clean-binPROGRAMS: -- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -- --distclean-binPROGRAMS: -- --maintainer-clean-binPROGRAMS: -- -+libdbmail.la: $(libdbmail_la_OBJECTS) $(libdbmail_la_DEPENDENCIES) -+ $(LINK) $(libdbmail_la_LDFLAGS) $(libdbmail_la_OBJECTS) $(libdbmail_la_LIBADD) $(LIBS) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(bindir) -+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ -- if test -f $$p; then \ -- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -+ if test -f $$p \ -+ || test -f $$p1 \ -+ ; then \ -+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - - uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) -- list='$(bin_PROGRAMS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ @list='$(bin_PROGRAMS)'; for p in $$list; do \ -+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - --mostlyclean-sbinPROGRAMS: -- --clean-sbinPROGRAMS: -- -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) -- --distclean-sbinPROGRAMS: -- --maintainer-clean-sbinPROGRAMS: -- -+clean-binPROGRAMS: -+ @list='$(bin_PROGRAMS)'; for p in $$list; do \ -+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -+ echo " rm -f $$p $$f"; \ -+ rm -f $$p $$f ; \ -+ done - install-sbinPROGRAMS: $(sbin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(sbindir) -+ test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ -- if test -f $$p; then \ -- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -+ if test -f $$p \ -+ || test -f $$p1 \ -+ ; then \ -+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ - else :; fi; \ - done - - uninstall-sbinPROGRAMS: - @$(NORMAL_UNINSTALL) -- list='$(sbin_PROGRAMS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ @list='$(sbin_PROGRAMS)'; for p in $$list; do \ -+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -+ echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(sbindir)/$$f"; \ - done - --dbmail-sievecmd$(EXEEXT): $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_DEPENDENCIES) -+clean-sbinPROGRAMS: -+ @list='$(sbin_PROGRAMS)'; for p in $$list; do \ -+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -+ echo " rm -f $$p $$f"; \ -+ rm -f $$p $$f ; \ -+ done -+dbmail-imapd$(EXEEXT): $(dbmail_imapd_OBJECTS) $(dbmail_imapd_DEPENDENCIES) -+ @rm -f dbmail-imapd$(EXEEXT) -+ $(LINK) $(dbmail_imapd_LDFLAGS) $(dbmail_imapd_OBJECTS) $(dbmail_imapd_LDADD) $(LIBS) -+dbmail-lmtpd$(EXEEXT): $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_DEPENDENCIES) -+ @rm -f dbmail-lmtpd$(EXEEXT) -+ $(LINK) $(dbmail_lmtpd_LDFLAGS) $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_LDADD) $(LIBS) -+dbmail-pop3d$(EXEEXT): $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_DEPENDENCIES) -+ @rm -f dbmail-pop3d$(EXEEXT) -+ $(LINK) $(dbmail_pop3d_LDFLAGS) $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_LDADD) $(LIBS) -+dbmail-sievecmd$(EXEEXT): $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_DEPENDENCIES) - @rm -f dbmail-sievecmd$(EXEEXT) - $(LINK) $(dbmail_sievecmd_LDFLAGS) $(dbmail_sievecmd_OBJECTS) $(dbmail_sievecmd_LDADD) $(LIBS) -- --dbmail-timsieved$(EXEEXT): $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_DEPENDENCIES) -+dbmail-smtp$(EXEEXT): $(dbmail_smtp_OBJECTS) $(dbmail_smtp_DEPENDENCIES) -+ @rm -f dbmail-smtp$(EXEEXT) -+ $(LINK) $(dbmail_smtp_LDFLAGS) $(dbmail_smtp_OBJECTS) $(dbmail_smtp_LDADD) $(LIBS) -+dbmail-timsieved$(EXEEXT): $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_DEPENDENCIES) - @rm -f dbmail-timsieved$(EXEEXT) - $(LINK) $(dbmail_timsieved_LDFLAGS) $(dbmail_timsieved_OBJECTS) $(dbmail_timsieved_LDADD) $(LIBS) -+dbmail-users$(EXEEXT): $(dbmail_users_OBJECTS) $(dbmail_users_DEPENDENCIES) -+ @rm -f dbmail-users$(EXEEXT) -+ $(LINK) $(dbmail_users_LDFLAGS) $(dbmail_users_OBJECTS) $(dbmail_users_LDADD) $(LIBS) -+dbmail-util$(EXEEXT): $(dbmail_util_OBJECTS) $(dbmail_util_DEPENDENCIES) -+ @rm -f dbmail-util$(EXEEXT) -+ $(LINK) $(dbmail_util_LDFLAGS) $(dbmail_util_OBJECTS) $(dbmail_util_LDADD) $(LIBS) - --dbmail-smtp$(EXEEXT): $(dbmail_smtp_OBJECTS) $(dbmail_smtp_DEPENDENCIES) -- @rm -f dbmail-smtp$(EXEEXT) -- $(LINK) $(dbmail_smtp_LDFLAGS) $(dbmail_smtp_OBJECTS) $(dbmail_smtp_LDADD) $(LIBS) -+mostlyclean-compile: -+ -rm -f *.$(OBJEXT) - --dbmail-pop3d$(EXEEXT): $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_DEPENDENCIES) -- @rm -f dbmail-pop3d$(EXEEXT) -- $(LINK) $(dbmail_pop3d_LDFLAGS) $(dbmail_pop3d_OBJECTS) $(dbmail_pop3d_LDADD) $(LIBS) -+distclean-compile: -+ -rm -f *.tab.c - --dbmail-imapd$(EXEEXT): $(dbmail_imapd_OBJECTS) $(dbmail_imapd_DEPENDENCIES) -- @rm -f dbmail-imapd$(EXEEXT) -- $(LINK) $(dbmail_imapd_LDFLAGS) $(dbmail_imapd_OBJECTS) $(dbmail_imapd_LDADD) $(LIBS) -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acl.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmd5.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbmsgbuf.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbsearch.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dm_getopt.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsn.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/forward.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imap4.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imapcommands.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imapd.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imaputil.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtp.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmtpd.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maintenance.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memblock.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mime.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pidfile.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pool.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pop3.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pop3d.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quota.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfcmsg.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serverchild.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sievecmd.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timsieve.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timsieved.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user.Po@am__quote@ - --dbmail-util$(EXEEXT): $(dbmail_util_OBJECTS) $(dbmail_util_DEPENDENCIES) -- @rm -f dbmail-util$(EXEEXT) -- $(LINK) $(dbmail_util_LDFLAGS) $(dbmail_util_OBJECTS) $(dbmail_util_LDADD) $(LIBS) -+.c.o: -+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - --dbmail-users$(EXEEXT): $(dbmail_users_OBJECTS) $(dbmail_users_DEPENDENCIES) -- @rm -f dbmail-users$(EXEEXT) -- $(LINK) $(dbmail_users_LDFLAGS) $(dbmail_users_OBJECTS) $(dbmail_users_LDADD) $(LIBS) -+.c.obj: -+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - --dbmail-lmtpd$(EXEEXT): $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_DEPENDENCIES) -- @rm -f dbmail-lmtpd$(EXEEXT) -- $(LINK) $(dbmail_lmtpd_LDFLAGS) $(dbmail_lmtpd_OBJECTS) $(dbmail_lmtpd_LDADD) $(LIBS) -+.c.lo: -+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+ - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, - # (1) if the variable is set in `config.status', edit `config.status' - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. -- --@SET_MAKE@ -- --all-recursive install-data-recursive install-exec-recursive \ --installdirs-recursive install-recursive uninstall-recursive \ --check-recursive installcheck-recursive info-recursive dvi-recursive: -- @set fnord $(MAKEFLAGS); amf=$$2; \ -+$(RECURSIVE_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -463,7 +565,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ -@@ -471,13 +573,24 @@ - - mostlyclean-recursive clean-recursive distclean-recursive \ - maintainer-clean-recursive: -- @set fnord $(MAKEFLAGS); amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ -- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ -- rev="$$subdir $$rev"; \ -- test "$$subdir" != "." || dot_seen=yes; \ -+ case "$@" in \ -+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -+ *) list='$(SUBDIRS)' ;; \ -+ esac; \ -+ rev=''; for subdir in $$list; do \ -+ if test "$$subdir" = "."; then :; else \ -+ rev="$$subdir $$rev"; \ -+ fi; \ - done; \ -- test "$$dot_seen" = "no" && rev=". $$rev"; \ -+ rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ -@@ -487,246 +600,327 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -+ctags-recursive: -+ list='$(SUBDIRS)'; for subdir in $$list; do \ -+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ -+ done - -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ mkid -fID $$unique - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -- --TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) $(LISP) -+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ include_option=--etags-include; \ -+ empty_fix=.; \ -+ else \ -+ include_option=--include; \ -+ empty_fix=; \ -+ fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -- if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ -- fi; \ -+ if test "$$subdir" = .; then :; else \ -+ test ! -f $$subdir/TAGS || \ -+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ -+ fi; \ - done; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -+ list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)config.in$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.in $$unique $(LISP)) -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi -+ctags: CTAGS -+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique - --mostlyclean-tags: -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) $$here - --clean-tags: -- - distclean-tags: -- -rm -f TAGS ID -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - --maintainer-clean-tags: -- --distdir = $(PACKAGE)-$(VERSION) --top_distdir = $(distdir) -- --# This target untars the dist file and tries a VPATH configuration. Then --# it guarantees that the distribution is self-contained by making another --# tarfile. --distcheck: dist -- -rm -rf $(distdir) -- GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz -- mkdir $(distdir)/=build -- mkdir $(distdir)/=inst -- dc_install_base=`cd $(distdir)/=inst && pwd`; \ -- cd $(distdir)/=build \ -- && ../configure --srcdir=.. --prefix=$$dc_install_base \ -- && $(MAKE) $(AM_MAKEFLAGS) \ -- && $(MAKE) $(AM_MAKEFLAGS) dvi \ -- && $(MAKE) $(AM_MAKEFLAGS) check \ -- && $(MAKE) $(AM_MAKEFLAGS) install \ -- && $(MAKE) $(AM_MAKEFLAGS) installcheck \ -- && $(MAKE) $(AM_MAKEFLAGS) dist -- -rm -rf $(distdir) -- @banner="$(distdir).tar.gz is ready for distribution"; \ -- dashes=`echo "$$banner" | sed s/./=/g`; \ -- echo "$$dashes"; \ -- echo "$$banner"; \ -- echo "$$dashes" --dist: distdir -- -chmod -R a+r $(distdir) -- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -- -rm -rf $(distdir) --dist-all: distdir -- -chmod -R a+r $(distdir) -- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -- -rm -rf $(distdir) - distdir: $(DISTFILES) -- -rm -rf $(distdir) -+ $(am__remove_distdir) - mkdir $(distdir) -- -chmod 777 $(distdir) -- here=`cd $(top_builddir) && pwd`; \ -- top_distdir=`cd $(distdir) && pwd`; \ -- distdir=`cd $(distdir) && pwd`; \ -- cd $(top_srcdir) \ -- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile -- @for file in $(DISTFILES); do \ -- d=$(srcdir); \ -+ $(mkdir_p) $(distdir)/buildtools -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -+ dir="/$$dir"; \ -+ $(mkdir_p) "$(distdir)$$dir"; \ -+ else \ -+ dir=''; \ -+ fi; \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done -- for subdir in $(SUBDIRS); do \ -+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d $(distdir)/$$subdir \ -- || mkdir $(distdir)/$$subdir \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ -- chmod 777 $(distdir)/$$subdir; \ -- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ -+ (cd $$subdir && \ -+ $(MAKE) $(AM_MAKEFLAGS) \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ distdir) \ - || exit 1; \ - fi; \ - done -+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ -+ || chmod -R a+r $(distdir) -+dist-gzip: distdir -+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(am__remove_distdir) - --DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+dist-bzip2: distdir -+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 -+ $(am__remove_distdir) - ---include $(DEP_FILES) -+dist-tarZ: distdir -+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z -+ $(am__remove_distdir) - --mostlyclean-depend: -+dist-shar: distdir -+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz -+ $(am__remove_distdir) - --clean-depend: -+dist-zip: distdir -+ -rm -f $(distdir).zip -+ zip -rq $(distdir).zip $(distdir) -+ $(am__remove_distdir) - --distclean-depend: -- -rm -rf .deps -+dist dist-all: distdir -+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(am__remove_distdir) - --maintainer-clean-depend: -- --%.o: %.c -- @echo '$(COMPILE) -c $<'; \ -- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -- @-cp .deps/$(*F).pp .deps/$(*F).P; \ -- tr ' ' '\012' < .deps/$(*F).pp \ -- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -- >> .deps/$(*F).P; \ -- rm .deps/$(*F).pp -- --%.lo: %.c -- @echo '$(LTCOMPILE) -c $<'; \ -- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -- @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -- < .deps/$(*F).pp > .deps/$(*F).P; \ -- tr ' ' '\012' < .deps/$(*F).pp \ -- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -- >> .deps/$(*F).P; \ -- rm -f .deps/$(*F).pp --info-am: --info: info-recursive --dvi-am: --dvi: dvi-recursive -+# This target untars the dist file and tries a VPATH configuration. Then -+# it guarantees that the distribution is self-contained by making another -+# tarfile. -+distcheck: dist -+ case '$(DIST_ARCHIVES)' in \ -+ *.tar.gz*) \ -+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ -+ *.tar.bz2*) \ -+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ *.tar.Z*) \ -+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ -+ *.shar.gz*) \ -+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ -+ *.zip*) \ -+ unzip $(distdir).zip ;;\ -+ esac -+ chmod -R a-w $(distdir); chmod a+w $(distdir) -+ mkdir $(distdir)/_build -+ mkdir $(distdir)/_inst -+ chmod a-w $(distdir) -+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ -+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ -+ && cd $(distdir)/_build \ -+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ -+ $(DISTCHECK_CONFIGURE_FLAGS) \ -+ && $(MAKE) $(AM_MAKEFLAGS) \ -+ && $(MAKE) $(AM_MAKEFLAGS) dvi \ -+ && $(MAKE) $(AM_MAKEFLAGS) check \ -+ && $(MAKE) $(AM_MAKEFLAGS) install \ -+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ -+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ -+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ -+ distuninstallcheck \ -+ && chmod -R a-w "$$dc_install_base" \ -+ && ({ \ -+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ -+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ -+ } || { rm -rf "$$dc_destdir"; exit 1; }) \ -+ && rm -rf "$$dc_destdir" \ -+ && $(MAKE) $(AM_MAKEFLAGS) dist \ -+ && rm -rf $(DIST_ARCHIVES) \ -+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck -+ $(am__remove_distdir) -+ @(echo "$(distdir) archives ready for distribution: "; \ -+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ -+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -+distuninstallcheck: -+ @cd $(distuninstallcheck_dir) \ -+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -+ || { echo "ERROR: files left after uninstall:" ; \ -+ if test -n "$(DESTDIR)"; then \ -+ echo " (check DESTDIR support)"; \ -+ fi ; \ -+ $(distuninstallcheck_listfiles) ; \ -+ exit 1; } >&2 -+distcleancheck: distclean -+ @if test '$(srcdir)' = . ; then \ -+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ -+ exit 1 ; \ -+ fi -+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ -+ || { echo "ERROR: files left in build directory after distclean:" ; \ -+ $(distcleancheck_listfiles) ; \ -+ exit 1; } >&2 - check-am: all-am - check: check-recursive --installcheck-am: --installcheck: installcheck-recursive --all-recursive-am: config.h -- $(MAKE) $(AM_MAKEFLAGS) all-recursive -- --install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \ -- install-sbinPROGRAMS -+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h -+installdirs: installdirs-recursive -+installdirs-am: -+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"; do \ -+ test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ done -+install: install-recursive - install-exec: install-exec-recursive -- --install-data-am: - install-data: install-data-recursive -+uninstall: uninstall-recursive - - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am --install: install-recursive --uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \ -- uninstall-sbinPROGRAMS --uninstall: uninstall-recursive --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) config.h --all-redirect: all-recursive-am -+ -+installcheck: installcheck-recursive - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install --installdirs: installdirs-recursive --installdirs-am: -- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ -- $(DESTDIR)$(sbindir) -- -- -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -- -rm -f config.cache config.log stamp-h stamp-h[0-9]* -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-hdr mostlyclean-libLTLIBRARIES \ -- mostlyclean-compile mostlyclean-libtool \ -- mostlyclean-binPROGRAMS mostlyclean-sbinPROGRAMS \ -- mostlyclean-tags mostlyclean-depend mostlyclean-generic -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+clean: clean-recursive - --mostlyclean: mostlyclean-recursive -+clean-am: clean-binPROGRAMS clean-generic clean-libtool \ -+ clean-noinstLTLIBRARIES clean-sbinPROGRAMS mostlyclean-am - --clean-am: clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \ -- clean-binPROGRAMS clean-sbinPROGRAMS clean-tags \ -- clean-depend clean-generic mostlyclean-am -+distclean: distclean-recursive -+ -rm -f $(am__CONFIG_DISTCLEAN_FILES) -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-hdr distclean-libtool distclean-tags - --clean: clean-recursive -+dvi: dvi-recursive - --distclean-am: distclean-hdr distclean-libLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-binPROGRAMS \ -- distclean-sbinPROGRAMS distclean-tags distclean-depend \ -- distclean-generic clean-am -- -rm -f libtool -+dvi-am: - --distclean: distclean-recursive -- -rm -f config.status -+html: html-recursive - --maintainer-clean-am: maintainer-clean-hdr \ -- maintainer-clean-libLTLIBRARIES \ -- maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-binPROGRAMS \ -- maintainer-clean-sbinPROGRAMS maintainer-clean-tags \ -- maintainer-clean-depend maintainer-clean-generic \ -- distclean-am -- @echo "This command is intended for maintainers to use;" -- @echo "it deletes files that may require special tools to rebuild." -+info: info-recursive - -+info-am: -+ -+install-data-am: -+ -+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS -+ -+install-info: install-info-recursive -+ -+install-man: -+ -+installcheck-am: -+ - maintainer-clean: maintainer-clean-recursive -- -rm -f config.status -+ -rm -f $(am__CONFIG_DISTCLEAN_FILES) -+ -rm -rf $(top_srcdir)/autom4te.cache -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic - --.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ --mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ --clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ --uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ --distclean-compile clean-compile maintainer-clean-compile \ --mostlyclean-libtool distclean-libtool clean-libtool \ --maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \ --clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ --install-binPROGRAMS mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS \ --clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \ --install-sbinPROGRAMS install-data-recursive uninstall-data-recursive \ --install-exec-recursive uninstall-exec-recursive installdirs-recursive \ --uninstalldirs-recursive all-recursive check-recursive \ --installcheck-recursive info-recursive dvi-recursive \ --mostlyclean-recursive distclean-recursive clean-recursive \ --maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ --distclean-tags clean-tags maintainer-clean-tags distdir \ --mostlyclean-depend distclean-depend clean-depend \ --maintainer-clean-depend info-am info dvi-am dvi check check-am \ --installcheck-am installcheck all-recursive-am install-exec-am \ --install-exec install-data-am install-data install-am install \ --uninstall-am uninstall all-redirect all-am all installdirs-am \ --installdirs mostlyclean-generic distclean-generic clean-generic \ --maintainer-clean-generic clean mostlyclean distclean maintainer-clean -+mostlyclean: mostlyclean-recursive - -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool - -+pdf: pdf-recursive -+ -+pdf-am: -+ -+ps: ps-recursive -+ -+ps-am: -+ -+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ -+ uninstall-sbinPROGRAMS -+ -+uninstall-info: uninstall-info-recursive -+ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ -+ check-am clean clean-binPROGRAMS clean-generic clean-libtool \ -+ clean-noinstLTLIBRARIES clean-recursive clean-sbinPROGRAMS \ -+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ -+ dist-shar dist-tarZ dist-zip distcheck distclean \ -+ distclean-compile distclean-generic distclean-hdr \ -+ distclean-libtool distclean-recursive distclean-tags \ -+ distcleancheck distdir distuninstallcheck dvi dvi-am html \ -+ html-am info info-am install install-am install-binPROGRAMS \ -+ install-data install-data-am install-exec install-exec-am \ -+ install-info install-info-am install-man install-sbinPROGRAMS \ -+ install-strip installcheck installcheck-am installdirs \ -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ -+ uninstall-binPROGRAMS uninstall-info-am uninstall-sbinPROGRAMS -+ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: ---- man/Makefile.in (revision 1905) -+++ man/Makefile.in (revision 1948) -@@ -1,6 +1,8 @@ --# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -+# Makefile.in generated by automake 1.9.6 from Makefile.am. -+# @configure_input@ - --# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,6 +12,8 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - -+@SET_MAKE@ -+ - # Copyright (C) 1999-2004 IC & S dbmail@ic-s.nl - # - # This program is free software; you can redistribute it and/or -@@ -26,88 +30,116 @@ - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -- -- --SHELL = @SHELL@ -- - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include -- --DESTDIR = -- - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -- - top_builddir = .. -- --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --transform = @program_transform_name@ -- -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --host_alias = @host_alias@ -+build_triplet = @build@ - host_triplet = @host@ -+subdir = man -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+man1dir = $(mandir)/man1 -+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" -+man8dir = $(mandir)/man8 -+NROFF = nroff -+MANS = $(man_MANS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ -+AMTAR = @AMTAR@ - AR = @AR@ --AS = @AS@ - AUTHALIB = @AUTHALIB@ - AUTHLTLIB = @AUTHLTLIB@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ --DLLTOOL = @DLLTOOL@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ - ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ - EGREP = @EGREP@ - EXEEXT = @EXEEXT@ - F77 = @F77@ --GCJ = @GCJ@ --GCJFLAGS = @GCJFLAGS@ --HAVE_LIB = @HAVE_LIB@ -+FFLAGS = @FFLAGS@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDAPINC = @LDAPINC@ - LDAPLIB = @LDAPLIB@ --LIB = @LIB@ -+LDAP_FALSE = @LDAP_FALSE@ -+LDAP_TRUE = @LDAP_TRUE@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ --LTLIB = @LTLIB@ -+LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MYSQLINC = @MYSQLINC@ --OBJDUMP = @OBJDUMP@ -+MYSQL_FALSE = @MYSQL_FALSE@ -+MYSQL_TRUE = @MYSQL_TRUE@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - PGSQLINC = @PGSQLINC@ -+PGSQL_FALSE = @PGSQL_FALSE@ -+PGSQL_TRUE = @PGSQL_TRUE@ - RANLIB = @RANLIB@ --RC = @RC@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ - SIEVEINC = @SIEVEINC@ - SIEVELIB = @SIEVELIB@ -+SIEVE_FALSE = @SIEVE_FALSE@ -+SIEVE_TRUE = @SIEVE_TRUE@ - SORTALIB = @SORTALIB@ - SORTLTLIB = @SORTLTLIB@ - SQLALIB = @SQLALIB@ -@@ -115,41 +147,105 @@ - SQLLTLIB = @SQLLTLIB@ - STRIP = @STRIP@ - USE_DM_GETOPT = @USE_DM_GETOPT@ -+USE_DM_GETOPT_FALSE = @USE_DM_GETOPT_FALSE@ -+USE_DM_GETOPT_TRUE = @USE_DM_GETOPT_TRUE@ - VERSION = @VERSION@ -+ac_ct_AR = @ac_ct_AR@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+ac_ct_RANLIB = @ac_ct_RANLIB@ -+ac_ct_STRIP = @ac_ct_STRIP@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+datadir = @datadir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ - mysqlconfig = @mysqlconfig@ -+oldincludedir = @oldincludedir@ - pgsqlconfig = @pgsqlconfig@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+man_MANS = dbmail-pop3d.8 dbmail-smtp.1 dbmail-imapd.8 \ -+ dbmail-users.8 dbmail-util.8 dbmail-lmtpd.8 - --man_MANS = dbmail-pop3d.8 dbmail-smtp.1 dbmail-imapd.8 dbmail-users.8 dbmail-util.8 dbmail-lmtpd.8 -+all: all-am - --mkinstalldirs = $(SHELL) $(top_srcdir)/buildtools/mkinstalldirs --CONFIG_HEADER = ../config.h --CONFIG_CLEAN_FILES = --man1dir = $(mandir)/man1 --man8dir = $(mandir)/man8 --MANS = $(man_MANS) -+.SUFFIXES: -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --gnu man/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; - --NROFF = nroff --DIST_COMMON = Makefile.am Makefile.in -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -+mostlyclean-libtool: -+ -rm -f *.lo - --TAR = tar --GZIP_ENV = --best --all: all-redirect --.SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile -+clean-libtool: -+ -rm -rf .libs _libs - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) -- cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -- -- --install-man1: -- $(mkinstalldirs) $(DESTDIR)$(man1dir) -- @list='$(man1_MANS)'; \ -- l2='$(man_MANS)'; for i in $$l2; do \ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+install-man1: $(man1_MANS) $(man_MANS) -+ @$(NORMAL_INSTALL) -+ test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" -+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ -+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ -+ for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ -@@ -158,31 +254,43 @@ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -+ case "$$ext" in \ -+ 1*) ;; \ -+ *) ext='1' ;; \ -+ esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ -+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ -+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done -- - uninstall-man1: -- @list='$(man1_MANS)'; \ -- l2='$(man_MANS)'; for i in $$l2; do \ -+ @$(NORMAL_UNINSTALL) -+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ -+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ -+ for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -+ case "$$ext" in \ -+ 1*) ;; \ -+ *) ext='1' ;; \ -+ esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ -- rm -f $(DESTDIR)$(man1dir)/$$inst; \ -+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ -+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done -- --install-man8: -- $(mkinstalldirs) $(DESTDIR)$(man8dir) -- @list='$(man8_MANS)'; \ -- l2='$(man_MANS)'; for i in $$l2; do \ -+install-man8: $(man8_MANS) $(man_MANS) -+ @$(NORMAL_INSTALL) -+ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" -+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ -+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ -+ for i in $$l2; do \ - case "$$i" in \ - *.8*) list="$$list $$i" ;; \ - esac; \ -@@ -191,120 +299,161 @@ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -+ case "$$ext" in \ -+ 8*) ;; \ -+ *) ext='8' ;; \ -+ esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \ -+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ -+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ - done -- - uninstall-man8: -- @list='$(man8_MANS)'; \ -- l2='$(man_MANS)'; for i in $$l2; do \ -+ @$(NORMAL_UNINSTALL) -+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ -+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ -+ for i in $$l2; do \ - case "$$i" in \ - *.8*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -+ case "$$ext" in \ -+ 8*) ;; \ -+ *) ext='8' ;; \ -+ esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -+ inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \ -- rm -f $(DESTDIR)$(man8dir)/$$inst; \ -+ echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ -+ rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ - done --install-man: $(MANS) -- @$(NORMAL_INSTALL) -- $(MAKE) $(AM_MAKEFLAGS) install-man1 install-man8 --uninstall-man: -- @$(NORMAL_UNINSTALL) -- $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 uninstall-man8 - tags: TAGS - TAGS: - -+ctags: CTAGS -+CTAGS: - --distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - --subdir = man -- - distdir: $(DISTFILES) -- here=`cd $(top_builddir) && pwd`; \ -- top_distdir=`cd $(top_distdir) && pwd`; \ -- distdir=`cd $(distdir) && pwd`; \ -- cd $(top_srcdir) \ -- && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile -- @for file in $(DISTFILES); do \ -- d=$(srcdir); \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -+ dir="/$$dir"; \ -+ $(mkdir_p) "$(distdir)$$dir"; \ -+ else \ -+ dir=''; \ -+ fi; \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ -- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- || cp -p $$d/$$file $(distdir)/$$file || :; \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ - fi; \ - done --info-am: --info: info-am --dvi-am: --dvi: dvi-am - check-am: all-am - check: check-am --installcheck-am: --installcheck: installcheck-am --install-exec-am: -+all-am: Makefile $(MANS) -+installdirs: -+ for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \ -+ test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ done -+install: install-am - install-exec: install-exec-am -- --install-data-am: install-man - install-data: install-data-am -+uninstall: uninstall-am - - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am --install: install-am --uninstall-am: uninstall-man --uninstall: uninstall-am --all-am: Makefile $(MANS) --all-redirect: all-am -+ -+installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install --installdirs: -- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man8 -- -- -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: - - distclean-generic: -- -rm -f Makefile $(CONFIG_CLEAN_FILES) -- -rm -f config.cache config.log stamp-h stamp-h[0-9]* -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: --mostlyclean-am: mostlyclean-generic -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+clean: clean-am - --mostlyclean: mostlyclean-am -+clean-am: clean-generic clean-libtool mostlyclean-am - --clean-am: clean-generic mostlyclean-am -+distclean: distclean-am -+ -rm -f Makefile -+distclean-am: clean-am distclean-generic distclean-libtool - --clean: clean-am -+dvi: dvi-am - --distclean-am: distclean-generic clean-am -- -rm -f libtool -+dvi-am: - --distclean: distclean-am -+html: html-am - --maintainer-clean-am: maintainer-clean-generic distclean-am -- @echo "This command is intended for maintainers to use;" -- @echo "it deletes files that may require special tools to rebuild." -+info: info-am - -+info-am: -+ -+install-data-am: install-man -+ -+install-exec-am: -+ -+install-info: install-info-am -+ -+install-man: install-man1 install-man8 -+ -+installcheck-am: -+ - maintainer-clean: maintainer-clean-am -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic - --.PHONY: install-man1 uninstall-man1 install-man8 uninstall-man8 \ --install-man uninstall-man tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ --install-data-am install-data install-am install uninstall-am uninstall \ --all-redirect all-am all installdirs mostlyclean-generic \ --distclean-generic clean-generic maintainer-clean-generic clean \ --mostlyclean distclean maintainer-clean -+mostlyclean: mostlyclean-am - -+mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ -+uninstall-am: uninstall-info-am uninstall-man -+ -+uninstall-man: uninstall-man1 uninstall-man8 -+ -+.PHONY: all all-am check check-am clean clean-generic clean-libtool \ -+ distclean distclean-generic distclean-libtool distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-exec install-exec-am \ -+ install-info install-info-am install-man install-man1 \ -+ install-man8 install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am uninstall uninstall-am uninstall-info-am \ -+ uninstall-man uninstall-man1 uninstall-man8 -+ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: ---- configure.in (revision 1905) -+++ configure.in (revision 1948) -@@ -19,7 +19,6 @@ - AC_INIT(main.c) - AC_CONFIG_AUX_DIR(buildtools) - AM_CONFIG_HEADER(config.h:config.in) --DBMAIL_MSG_CONFIGURE_START - AM_INIT_AUTOMAKE(dbmail, 2.0.7) - AM_MAINTAINER_MODE - ---- ChangeLog (revision 1905) -+++ ChangeLog (revision 1948) -@@ -1,3 +1,46 @@ -+2005-12-22 Paul J Stevens <paul@nfg.nl> -+ -+ * ChangeLog: -+ blah -+ * imapcommands.c, imaputil.c: -+ resync git tree -+ * ChangeLog: -+ Merge with /home/paul/git/dbmail-2.0 -+commit d97cef746efa52603fc423759bfe216b53859321 -+tree 32074d5cac257cf2b30ed48979ca88050441e4c7 -+parent 8c598295ff66c378785b2187f6923c99b5df2a6f -+author Paul J Stevens <paul@nfg.nl> Wed, 26 Oct 2005 09:56:05 +0200 -+committer Paul J Stevens <paul@nfg.nl> Wed, 26 Oct 2005 09:56:05 +0200 -+ * ChangeLog: -+ blah -+ * ChangeLog, debian/patches/04_mailfilter.dpatch: -+ update mailfilter dpatch -+ * debian/patches/04_mailfilter.dpatch: -+ update mailfilter patch -+ * debian/patches/04_mailfilter.dpatch: -+ update mailfilter patch -+ * debian/po/es.po: -+ adding spanish translation of debconf files -+ * INSTALL, INSTALL.dbmail, Makefile.in, acinclude.m4, aclocal.m4, -+ auth/Makefile.in, buildtools/install-sh, buildtools/ltmain.sh, -+ buildtools/missing, buildtools/mkinstalldirs, configure, -+ configure.in, debian/control, debian/rules, man/Makefile.in, -+ mysql/Makefile.in, pgsql/Makefile.in, sort/Makefile.in: -+ cleanup autotools chain a bit -+ * main.c: -+ remove redeclaration of global dsnuser (closes: #281) -+ * INSTALL, Makefile.in, auth/Makefile.in, buildtools/depcomp, debian/rules, -+ mysql/Makefile.in, pgsql/Makefile.in, sort/Makefile.in: -+ updated autotools for autoconf-1.9 -+ -+2005-10-26 Paul J Stevens <paul@nfg.nl> -+ -+ * dsn.c, main.c, server.c, serverchild.c, sql/mysql/create_tables.mysql, -+ sql/mysql/create_tables_innoDB.mysql: -+ resync tree -+ * imapcommands.c, imaputil.c: -+ initialize struct tm values before calling strptime (closes: #277) -+ - 2005-10-18 Paul J Stevens <paul@nfg.nl> - - * ChangeLog, auth/authsql.c, dsn.c, main.c: ---- buildtools/depcomp (revision 0) -+++ buildtools/depcomp (revision 1948) -@@ -0,0 +1,530 @@ -+#! /bin/sh -+# depcomp - compile a program generating dependencies as side-effects -+ -+scriptversion=2005-07-09.11 -+ -+# Copyright (C) 1999, 2000, 2003, 2004, 2005 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 -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+ -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+# 02110-1301, USA. -+ -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. -+ -+case $1 in -+ '') -+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 -+ exit 1; -+ ;; -+ -h | --h*) -+ cat <<\EOF -+Usage: depcomp [--help] [--version] PROGRAM [ARGS] -+ -+Run PROGRAMS ARGS to compile a file, generating dependencies -+as side-effects. -+ -+Environment variables: -+ depmode Dependency tracking mode. -+ source Source file read by `PROGRAMS ARGS'. -+ object Object file output by `PROGRAMS ARGS'. -+ DEPDIR directory where to store dependencies. -+ depfile Dependency file to output. -+ tmpdepfile Temporary file to use when outputing dependencies. -+ libtool Whether libtool is used (yes/no). -+ -+Report bugs to <bug-automake@gnu.org>. -+EOF -+ exit $? -+ ;; -+ -v | --v*) -+ echo "depcomp $scriptversion" -+ exit $? -+ ;; -+esac -+ -+if test -z "$depmode" || test -z "$source" || test -z "$object"; then -+ echo "depcomp: Variables source, object and depmode must be set" 1>&2 -+ exit 1 -+fi -+ -+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -+depfile=${depfile-`echo "$object" | -+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} -+ -+rm -f "$tmpdepfile" -+ -+# Some modes work just like other modes, but use different flags. We -+# parameterize here, but still list the modes in the big case below, -+# to make depend.m4 easier to write. Note that we *cannot* use a case -+# here, because this file can only contain one case statement. -+if test "$depmode" = hp; then -+ # HP compiler uses -M and no extra arg. -+ gccflag=-M -+ depmode=gcc -+fi -+ -+if test "$depmode" = dashXmstdout; then -+ # This is just like dashmstdout with a different argument. -+ dashmflag=-xM -+ depmode=dashmstdout -+fi -+ -+case "$depmode" in -+gcc3) -+## gcc 3 implements dependency tracking that does exactly what -+## we want. Yay! Note: for some reason libtool 1.4 doesn't like -+## it if -MD -MP comes after the -MF stuff. Hmm. -+ "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" -+ stat=$? -+ if test $stat -eq 0; then : -+ else -+ rm -f "$tmpdepfile" -+ exit $stat -+ fi -+ mv "$tmpdepfile" "$depfile" -+ ;; -+ -+gcc) -+## There are various ways to get dependency output from gcc. Here's -+## why we pick this rather obscure method: -+## - Don't want to use -MD because we'd like the dependencies to end -+## up in a subdir. Having to rename by hand is ugly. -+## (We might end up doing this anyway to support other compilers.) -+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -+## -MM, not -M (despite what the docs say). -+## - Using -M directly means running the compiler twice (even worse -+## than renaming). -+ if test -z "$gccflag"; then -+ gccflag=-MD, -+ fi -+ "$@" -Wp,"$gccflag$tmpdepfile" -+ stat=$? -+ if test $stat -eq 0; then : -+ else -+ rm -f "$tmpdepfile" -+ exit $stat -+ fi -+ rm -f "$depfile" -+ echo "$object : \\" > "$depfile" -+ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -+## The second -e expression handles DOS-style file names with drive letters. -+ sed -e 's/^[^:]*: / /' \ -+ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -+## This next piece of magic avoids the `deleted header file' problem. -+## The problem is that when a header file which appears in a .P file -+## is deleted, the dependency causes make to die (because there is -+## typically no way to rebuild the header). We avoid this by adding -+## dummy dependencies for each header file. Too bad gcc doesn't do -+## this for us directly. -+ tr ' ' ' -+' < "$tmpdepfile" | -+## Some versions of gcc put a space before the `:'. On the theory -+## that the space means something, we add a space to the output as -+## well. -+## Some versions of the HPUX 10.20 sed can't process this invocation -+## correctly. Breaking it into two sed invocations is a workaround. -+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" -+ rm -f "$tmpdepfile" -+ ;; -+ -+hp) -+ # This case exists only to let depend.m4 do its work. It works by -+ # looking at the text of this script. This case will never be run, -+ # since it is checked for above. -+ exit 1 -+ ;; -+ -+sgi) -+ if test "$libtool" = yes; then -+ "$@" "-Wp,-MDupdate,$tmpdepfile" -+ else -+ "$@" -MDupdate "$tmpdepfile" -+ fi -+ stat=$? -+ if test $stat -eq 0; then : -+ else -+ rm -f "$tmpdepfile" -+ exit $stat -+ fi -+ rm -f "$depfile" -+ -+ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files -+ echo "$object : \\" > "$depfile" -+ -+ # Clip off the initial element (the dependent). Don't try to be -+ # clever and replace this with sed code, as IRIX sed won't handle -+ # lines with more than a fixed number of characters (4096 in -+ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; -+ # the IRIX cc adds comments like `#:fec' to the end of the -+ # dependency line. -+ tr ' ' ' -+' < "$tmpdepfile" \ -+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ -+ tr ' -+' ' ' >> $depfile -+ echo >> $depfile -+ -+ # The second pass generates a dummy entry for each header file. -+ tr ' ' ' -+' < "$tmpdepfile" \ -+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ -+ >> $depfile -+ else -+ # The sourcefile does not contain any dependencies, so just -+ # store a dummy comment line, to avoid errors with the Makefile -+ # "include basename.Plo" scheme. -+ echo "#dummy" > "$depfile" -+ fi -+ rm -f "$tmpdepfile" -+ ;; -+ -+aix) -+ # The C for AIX Compiler uses -M and outputs the dependencies -+ # in a .u file. In older versions, this file always lives in the -+ # current directory. Also, the AIX compiler puts `$object:' at the -+ # start of each line; $object doesn't have directory information. -+ # Version 6 uses the directory in both cases. -+ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` -+ tmpdepfile="$stripped.u" -+ if test "$libtool" = yes; then -+ "$@" -Wc,-M -+ else -+ "$@" -M -+ fi -+ stat=$? -+ -+ if test -f "$tmpdepfile"; then : -+ else -+ stripped=`echo "$stripped" | sed 's,^.*/,,'` -+ tmpdepfile="$stripped.u" -+ fi -+ -+ if test $stat -eq 0; then : -+ else -+ rm -f "$tmpdepfile" -+ exit $stat -+ fi -+ -+ if test -f "$tmpdepfile"; then -+ outname="$stripped.o" -+ # Each line is of the form `foo.o: dependent.h'. -+ # Do two passes, one to just change these to -+ # `$object: dependent.h' and one to simply `dependent.h:'. -+ sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" -+ sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" -+ else -+ # The sourcefile does not contain any dependencies, so just -+ # store a dummy comment line, to avoid errors with the Makefile -+ # "include basename.Plo" scheme. -+ echo "#dummy" > "$depfile" -+ fi -+ rm -f "$tmpdepfile" -+ ;; -+ -+icc) -+ # Intel's C compiler understands `-MD -MF file'. However on -+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c -+ # ICC 7.0 will fill foo.d with something like -+ # foo.o: sub/foo.c -+ # foo.o: sub/foo.h -+ # which is wrong. We want: -+ # sub/foo.o: sub/foo.c -+ # sub/foo.o: sub/foo.h -+ # sub/foo.c: -+ # sub/foo.h: -+ # ICC 7.1 will output -+ # foo.o: sub/foo.c sub/foo.h -+ # and will wrap long lines using \ : -+ # foo.o: sub/foo.c ... \ -+ # sub/foo.h ... \ -+ # ... -+ -+ "$@" -MD -MF "$tmpdepfile" -+ stat=$? -+ if test $stat -eq 0; then : -+ else -+ rm -f "$tmpdepfile" -+ exit $stat -+ fi -+ rm -f "$depfile" -+ # Each line is of the form `foo.o: dependent.h', -+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. -+ # Do two passes, one to just change these to -+ # `$object: dependent.h' and one to simply `dependent.h:'. -+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" -+ # Some versions of the HPUX 10.20 sed can't process this invocation -+ # correctly. Breaking it into two sed invocations is a workaround. -+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | -+ sed -e 's/$/ :/' >> "$depfile" -+ rm -f "$tmpdepfile" -+ ;; -+ -+tru64) -+ # The Tru64 compiler uses -MD to generate dependencies as a side -+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. -+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put -+ # dependencies in `foo.d' instead, so we check for that too. -+ # Subdirectories are respected. -+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` -+ test "x$dir" = "x$object" && dir= -+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` -+ -+ if test "$libtool" = yes; then -+ # With Tru64 cc, shared objects can also be used to make a -+ # static library. This mecanism is used in libtool 1.4 series to -+ # handle both shared and static libraries in a single compilation. -+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. -+ # -+ # With libtool 1.5 this exception was removed, and libtool now -+ # generates 2 separate objects for the 2 libraries. These two -+ # compilations output dependencies in in $dir.libs/$base.o.d and -+ # in $dir$base.o.d. We have to check for both files, because -+ # one of the two compilations can be disabled. We should prefer -+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is -+ # automatically cleaned when .libs/ is deleted, while ignoring -+ # the former would cause a distcleancheck panic. -+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 -+ tmpdepfile2=$dir$base.o.d # libtool 1.5 -+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 -+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 -+ "$@" -Wc,-MD -+ else -+ tmpdepfile1=$dir$base.o.d -+ tmpdepfile2=$dir$base.d -+ tmpdepfile3=$dir$base.d -+ tmpdepfile4=$dir$base.d -+ "$@" -MD -+ fi -+ -+ stat=$? -+ if test $stat -eq 0; then : -+ else -+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" -+ exit $stat -+ fi -+ -+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" -+ do -+ test -f "$tmpdepfile" && break -+ done -+ if test -f "$tmpdepfile"; then -+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" -+ # That's a tab and a space in the []. -+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" -+ else -+ echo "#dummy" > "$depfile" -+ fi -+ rm -f "$tmpdepfile" -+ ;; -+ -+#nosideeffect) -+ # This comment above is used by automake to tell side-effect -+ # dependency tracking mechanisms from slower ones. -+ -+dashmstdout) -+ # Important note: in order to support this mode, a compiler *must* -+ # always write the preprocessed file to stdout, regardless of -o. -+ "$@" || exit $? -+ -+ # Remove the call to Libtool. -+ if test "$libtool" = yes; then -+ while test $1 != '--mode=compile'; do -+ shift -+ done -+ shift -+ fi -+ -+ # Remove `-o $object'. -+ IFS=" " -+ for arg -+ do -+ case $arg in -+ -o) -+ shift -+ ;; -+ $object) -+ shift -+ ;; -+ *) -+ set fnord "$@" "$arg" -+ shift # fnord -+ shift # $arg -+ ;; -+ esac -+ done -+ -+ test -z "$dashmflag" && dashmflag=-M -+ # Require at least two characters before searching for `:' -+ # in the target name. This is to cope with DOS-style filenames: -+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. -+ "$@" $dashmflag | -+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" -+ rm -f "$depfile" -+ cat < "$tmpdepfile" > "$depfile" -+ tr ' ' ' -+' < "$tmpdepfile" | \ -+## Some versions of the HPUX 10.20 sed can't process this invocation -+## correctly. Breaking it into two sed invocations is a workaround. -+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" -+ rm -f "$tmpdepfile" -+ ;; -+ -+dashXmstdout) -+ # This case only exists to satisfy depend.m4. It is never actually -+ # run, as this mode is specially recognized in the preamble. -+ exit 1 -+ ;; -+ -+makedepend) -+ "$@" || exit $? -+ # Remove any Libtool call -+ if test "$libtool" = yes; then -+ while test $1 != '--mode=compile'; do -+ shift -+ done -+ shift -+ fi -+ # X makedepend -+ shift -+ cleared=no -+ for arg in "$@"; do -+ case $cleared in -+ no) -+ set ""; shift -+ cleared=yes ;; -+ esac -+ case "$arg" in -+ -D*|-I*) -+ set fnord "$@" "$arg"; shift ;; -+ # Strip any option that makedepend may not understand. Remove -+ # the object too, otherwise makedepend will parse it as a source file. -+ -*|$object) -+ ;; -+ *) -+ set fnord "$@" "$arg"; shift ;; -+ esac -+ done -+ obj_suffix="`echo $object | sed 's/^.*\././'`" -+ touch "$tmpdepfile" -+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" -+ rm -f "$depfile" -+ cat < "$tmpdepfile" > "$depfile" -+ sed '1,2d' "$tmpdepfile" | tr ' ' ' -+' | \ -+## Some versions of the HPUX 10.20 sed can't process this invocation -+## correctly. Breaking it into two sed invocations is a workaround. -+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" -+ rm -f "$tmpdepfile" "$tmpdepfile".bak -+ ;; -+ -+cpp) -+ # Important note: in order to support this mode, a compiler *must* -+ # always write the preprocessed file to stdout. -+ "$@" || exit $? -+ -+ # Remove the call to Libtool. -+ if test "$libtool" = yes; then -+ while test $1 != '--mode=compile'; do -+ shift -+ done -+ shift -+ fi -+ -+ # Remove `-o $object'. -+ IFS=" " -+ for arg -+ do -+ case $arg in -+ -o) -+ shift -+ ;; -+ $object) -+ shift -+ ;; -+ *) -+ set fnord "$@" "$arg" -+ shift # fnord -+ shift # $arg -+ ;; -+ esac -+ done -+ -+ "$@" -E | -+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ -+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | -+ sed '$ s: \\$::' > "$tmpdepfile" -+ rm -f "$depfile" -+ echo "$object : \\" > "$depfile" -+ cat < "$tmpdepfile" >> "$depfile" -+ sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" -+ rm -f "$tmpdepfile" -+ ;; -+ -+msvisualcpp) -+ # Important note: in order to support this mode, a compiler *must* -+ # always write the preprocessed file to stdout, regardless of -o, -+ # because we must use -o when running libtool. -+ "$@" || exit $? -+ IFS=" " -+ for arg -+ do -+ case "$arg" in -+ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") -+ set fnord "$@" -+ shift -+ shift -+ ;; -+ *) -+ set fnord "$@" "$arg" -+ shift -+ shift -+ ;; -+ esac -+ done -+ "$@" -E | -+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" -+ rm -f "$depfile" -+ echo "$object : \\" > "$depfile" -+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" -+ echo " " >> "$depfile" -+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" -+ rm -f "$tmpdepfile" -+ ;; -+ -+none) -+ exec "$@" -+ ;; -+ -+*) -+ echo "Unknown depmode $depmode" 1>&2 -+ exit 1 -+ ;; -+esac -+ -+exit 0 -+ -+# Local Variables: -+# mode: shell-script -+# sh-indentation: 2 -+# eval: (add-hook 'write-file-hooks 'time-stamp) -+# time-stamp-start: "scriptversion=" -+# time-stamp-format: "%:y-%02m-%02d.%02H" -+# time-stamp-end: "$" -+# End: - ---- buildtools/missing (revision 1905) -+++ buildtools/missing (revision 1948) -@@ -1,8 +1,12 @@ - #! /bin/sh - # Common stub for a few missing GNU programs while installing. --# Copyright (C) 1996, 1997 Free Software Foundation, Inc. --# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996. - -+scriptversion=2005-06-08.21 -+ -+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. -+ - # 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 - # the Free Software Foundation; either version 2, or (at your option) -@@ -15,15 +19,47 @@ - - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+# 02110-1301, USA. - -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ - if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - fi - -+run=: -+ -+# In the cases where this matters, `missing' is being run in the -+# srcdir already. -+if test -f configure.ac; then -+ configure_ac=configure.ac -+else -+ configure_ac=configure.in -+fi -+ -+msg="missing on your system" -+ - case "$1" in -+--run) -+ # Try to run requested program, and just exit if it succeeds. -+ run= -+ shift -+ "$@" && exit 0 -+ # Exit code 63 means version mismatch. This often happens -+ # when the user try to use an ancient version of a tool on -+ # a file that requires a minimum version. In this case we -+ # we should proceed has if the program had been absent, or -+ # if --run hadn't been passed. -+ if test $? = 63; then -+ run=: -+ msg="probably too old" -+ fi -+ ;; - - -h|--h|--he|--hel|--help) - echo "\ -@@ -35,6 +71,7 @@ - Options: - -h, --help display this help and exit - -v, --version output version information and exit -+ --run try to run the given command, and emulate it if it fails - - Supported PROGRAM values: - aclocal touch file \`aclocal.m4' -@@ -43,13 +80,19 @@ - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c -+ help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file -- yacc create \`y.tab.[ch]', if possible, from existing .[ch]" -+ tar try tar, gnutar, gtar, then tar without non-portable flags -+ yacc create \`y.tab.[ch]', if possible, from existing .[ch] -+ -+Send bug reports to <bug-automake@gnu.org>." -+ exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) -- echo "missing - GNU libit 0.0" -+ echo "missing $scriptversion (GNU Automake)" -+ exit $? - ;; - - -*) -@@ -58,10 +101,45 @@ - exit 1 - ;; - -- aclocal) -+esac -+ -+# Now exit if we have it, but it failed. Also exit now if we -+# don't have it and --version was passed (most likely to detect -+# the program). -+case "$1" in -+ lex|yacc) -+ # Not GNU programs, they don't have --version. -+ ;; -+ -+ tar) -+ if test -n "$run"; then -+ echo 1>&2 "ERROR: \`tar' requires --run" -+ exit 1 -+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then -+ exit 1 -+ fi -+ ;; -+ -+ *) -+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then -+ # We have it, but it failed. -+ exit 1 -+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then -+ # Could not run --version or --help. This is probably someone -+ # running `$TOOL --version' or `$TOOL --help' to check whether -+ # $TOOL exists and not knowing $TOOL uses missing. -+ exit 1 -+ fi -+ ;; -+esac -+ -+# If it does not exist, or fails to run (possibly an outdated version), -+# try to emulate it. -+case "$1" in -+ aclocal*) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -- you modified \`acinclude.m4' or \`configure.in'. You might want -+WARNING: \`$1' is $msg. You should only need it if -+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 -@@ -69,8 +147,8 @@ - - autoconf) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -- you modified \`configure.in'. You might want to install the -+WARNING: \`$1' is $msg. You should only need it if -+ you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure -@@ -78,11 +156,11 @@ - - autoheader) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -- you modified \`acconfig.h' or \`configure.in'. You might want -+WARNING: \`$1' is $msg. You should only need it if -+ you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." -- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in` -+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do -@@ -95,10 +173,10 @@ - touch $touch_files - ;; - -- automake) -+ automake*) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -- you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. -+WARNING: \`$1' is $msg. You should only need it if -+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | -@@ -106,9 +184,32 @@ - while read f; do touch "$f"; done - ;; - -+ autom4te) -+ echo 1>&2 "\ -+WARNING: \`$1' is needed, but is $msg. -+ You might have modified some files without having the -+ proper tools for further handling them. -+ You can get \`$1' as part of \`Autoconf' from any GNU -+ archive site." -+ -+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` -+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` -+ if test -f "$file"; then -+ touch $file -+ else -+ test -z "$file" || exec >$file -+ echo "#! /bin/sh" -+ echo "# Created by GNU Automake missing as a replacement of" -+ echo "# $ $@" -+ echo "exit 0" -+ chmod +x $file -+ exit 1 -+ fi -+ ;; -+ - bison|yacc) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -+WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." -@@ -138,7 +239,7 @@ - - lex|flex) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -+WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." -@@ -159,28 +260,90 @@ - fi - ;; - -+ help2man) -+ echo 1>&2 "\ -+WARNING: \`$1' is $msg. You should only need it if -+ you modified a dependency of a manual page. You may need the -+ \`Help2man' package in order for those modifications to take -+ effect. You can get \`Help2man' from any GNU archive site." -+ -+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` -+ if test -z "$file"; then -+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` -+ fi -+ if [ -f "$file" ]; then -+ touch $file -+ else -+ test -z "$file" || exec >$file -+ echo ".ab help2man is required to generate this page" -+ exit 1 -+ fi -+ ;; -+ - makeinfo) - echo 1>&2 "\ --WARNING: \`$1' is missing on your system. You should only need it if -+WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." -+ # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then -- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` -- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` -+ # ... or it is the one specified with @setfilename ... -+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` -+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` -+ # ... or it is derived from the source name (dir/f.texi becomes f.info) -+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi -+ # If the file does not exist, the user really needs makeinfo; -+ # let's fail without touching anything. -+ test -f $file || exit 1 - touch $file - ;; - -+ tar) -+ shift -+ -+ # We have already tried tar in the generic part. -+ # Look for gnutar/gtar before invocation to avoid ugly error -+ # messages. -+ if (gnutar --version > /dev/null 2>&1); then -+ gnutar "$@" && exit 0 -+ fi -+ if (gtar --version > /dev/null 2>&1); then -+ gtar "$@" && exit 0 -+ fi -+ firstarg="$1" -+ if shift; then -+ case "$firstarg" in -+ *o*) -+ firstarg=`echo "$firstarg" | sed s/o//` -+ tar "$firstarg" "$@" && exit 0 -+ ;; -+ esac -+ case "$firstarg" in -+ *h*) -+ firstarg=`echo "$firstarg" | sed s/h//` -+ tar "$firstarg" "$@" && exit 0 -+ ;; -+ esac -+ fi -+ -+ echo 1>&2 "\ -+WARNING: I can't seem to be able to run \`tar' with the given arguments. -+ You may want to install GNU tar or Free paxutils, or check the -+ command line arguments." -+ exit 1 -+ ;; -+ - *) - echo 1>&2 "\ --WARNING: \`$1' is needed, and you do not seem to have it handy on your -- system. You might have modified some files without having the -+WARNING: \`$1' is needed, and is $msg. -+ You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, -- it often tells you about the needed prerequirements for installing -+ it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 -@@ -188,3 +351,10 @@ - esac - - exit 0 -+ -+# Local variables: -+# eval: (add-hook 'write-file-hooks 'time-stamp) -+# time-stamp-start: "scriptversion=" -+# time-stamp-format: "%:y-%02m-%02d.%02H" -+# time-stamp-end: "$" -+# End: ---- buildtools/install-sh (revision 1905) -+++ buildtools/install-sh (revision 1948) -@@ -1,20 +1,39 @@ - #!/bin/sh --# - # install - install a program, script, or datafile --# This comes from X11R5 (mit/util/scripts/install.sh). -+ -+scriptversion=2005-05-14.22 -+ -+# This originates from X11R5 (mit/util/scripts/install.sh), which was -+# later released in X11R6 (xc/config/util/install.sh) with the -+# following copyright and license. - # --# Copyright 1991 by the Massachusetts Institute of Technology -+# Copyright (C) 1994 X Consortium - # --# Permission to use, copy, modify, distribute, and sell this software and its --# documentation for any purpose is hereby granted without fee, provided that --# the above copyright notice appear in all copies and that both that --# copyright notice and this permission notice appear in supporting --# documentation, and that the name of M.I.T. not be used in advertising or --# publicity pertaining to distribution of the software without specific, --# written prior permission. M.I.T. makes no representations about the --# suitability of this software for any purpose. It is provided "as is" --# without express or implied warranty. -+# Permission is hereby granted, free of charge, to any person obtaining a copy -+# of this software and associated documentation files (the "Software"), to -+# deal in the Software without restriction, including without limitation the -+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -+# sell copies of the Software, and to permit persons to whom the Software is -+# furnished to do so, subject to the following conditions: - # -+# The above copyright notice and this permission notice shall be included in -+# all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+# -+# Except as contained in this notice, the name of the X Consortium shall not -+# be used in advertising or otherwise to promote the sale, use or other deal- -+# ings in this Software without prior written authorization from the X Consor- -+# tium. -+# -+# -+# FSF changes to this file are in the public domain. -+# - # Calling this script install-sh is preferred over install.sh, to prevent - # `make' implicit rules from creating a file called install from it - # when there is no Makefile. -@@ -23,13 +42,11 @@ - # from scratch. It can only install one file at a time, a restriction - # shared with many OS's install programs. - -- - # set DOITPROG to echo to test this script - - # Don't use :- since 4.3BSD and earlier shells don't like it. - doit="${DOITPROG-}" - -- - # put in absolute paths if you don't have them in your path; or use env. vars. - - mvprog="${MVPROG-mv}" -@@ -41,211 +58,266 @@ - rmprog="${RMPROG-rm}" - mkdirprog="${MKDIRPROG-mkdir}" - --transformbasename="" --transform_arg="" --instcmd="$mvprog" - chmodcmd="$chmodprog 0755" --chowncmd="" --chgrpcmd="" --stripcmd="" -+chowncmd= -+chgrpcmd= -+stripcmd= - rmcmd="$rmprog -f" - mvcmd="$mvprog" --src="" --dst="" --dir_arg="" -+src= -+dst= -+dir_arg= -+dstarg= -+no_target_directory= - --while [ x"$1" != x ]; do -- case $1 in -- -c) instcmd="$cpprog" -- shift -- continue;; -+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE -+ or: $0 [OPTION]... SRCFILES... DIRECTORY -+ or: $0 [OPTION]... -t DIRECTORY SRCFILES... -+ or: $0 [OPTION]... -d DIRECTORIES... - -- -d) dir_arg=true -- shift -- continue;; -+In the 1st form, copy SRCFILE to DSTFILE. -+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -+In the 4th, create DIRECTORIES. - -- -m) chmodcmd="$chmodprog $2" -- shift -- shift -- continue;; -+Options: -+-c (ignored) -+-d create directories instead of installing files. -+-g GROUP $chgrpprog installed files to GROUP. -+-m MODE $chmodprog installed files to MODE. -+-o USER $chownprog installed files to USER. -+-s $stripprog installed files. -+-t DIRECTORY install into DIRECTORY. -+-T report an error if DSTFILE is a directory. -+--help display this help and exit. -+--version display version info and exit. - -- -o) chowncmd="$chownprog $2" -- shift -- shift -- continue;; -+Environment variables override the default commands: -+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -+" - -- -g) chgrpcmd="$chgrpprog $2" -- shift -- shift -- continue;; -+while test -n "$1"; do -+ case $1 in -+ -c) shift -+ continue;; - -- -s) stripcmd="$stripprog" -- shift -- continue;; -+ -d) dir_arg=true -+ shift -+ continue;; - -- -t=*) transformarg=`echo $1 | sed 's/-t=//'` -- shift -- continue;; -+ -g) chgrpcmd="$chgrpprog $2" -+ shift -+ shift -+ continue;; - -- -b=*) transformbasename=`echo $1 | sed 's/-b=//'` -- shift -- continue;; -+ --help) echo "$usage"; exit $?;; - -- *) if [ x"$src" = x ] -- then -- src=$1 -- else -- # this colon is to work around a 386BSD /bin/sh bug -- : -- dst=$1 -- fi -- shift -- continue;; -- esac --done -+ -m) chmodcmd="$chmodprog $2" -+ shift -+ shift -+ continue;; - --if [ x"$src" = x ] --then -- echo "install: no input file specified" -- exit 1 --else -- true --fi -+ -o) chowncmd="$chownprog $2" -+ shift -+ shift -+ continue;; - --if [ x"$dir_arg" != x ]; then -- dst=$src -- src="" -- -- if [ -d $dst ]; then -- instcmd=: -- chmodcmd="" -- else -- instcmd=mkdir -- fi --else -+ -s) stripcmd=$stripprog -+ shift -+ continue;; - --# Waiting for this to be detected by the "$instcmd $src $dsttmp" command --# might cause directories to be created, which would be especially bad --# if $src (and thus $dsttmp) contains '*'. -+ -t) dstarg=$2 -+ shift -+ shift -+ continue;; - -- if [ -f $src -o -d $src ] -- then -- true -- else -- echo "install: $src does not exist" -- exit 1 -- fi -- -- if [ x"$dst" = x ] -- then -- echo "install: no destination specified" -- exit 1 -- else -- true -- fi -+ -T) no_target_directory=true -+ shift -+ continue;; - --# If destination is a directory, append the input filename; if your system --# does not like double slashes in filenames, you may need to add some logic -+ --version) echo "$0 $scriptversion"; exit $?;; - -- if [ -d $dst ] -- then -- dst="$dst"/`basename $src` -- else -- true -- fi -+ *) # When -d is used, all remaining arguments are directories to create. -+ # When -t is used, the destination is already specified. -+ test -n "$dir_arg$dstarg" && break -+ # Otherwise, the last argument is the destination. Remove it from $@. -+ for arg -+ do -+ if test -n "$dstarg"; then -+ # $@ is not empty: it contains at least $arg. -+ set fnord "$@" "$dstarg" -+ shift # fnord -+ fi -+ shift # arg -+ dstarg=$arg -+ done -+ break;; -+ esac -+done -+ -+if test -z "$1"; then -+ if test -z "$dir_arg"; then -+ echo "$0: no input file specified." >&2 -+ exit 1 -+ fi -+ # It's OK to call `install-sh -d' without argument. -+ # This can happen when creating conditional directories. -+ exit 0 - fi - --## this sed command emulates the dirname command --dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` -+for src -+do -+ # Protect names starting with `-'. -+ case $src in -+ -*) src=./$src ;; -+ esac - --# Make sure that the destination directory exists. --# this part is taken from Noah Friedman's mkinstalldirs script -+ if test -n "$dir_arg"; then -+ dst=$src -+ src= - --# Skip lots of stat calls in the usual case. --if [ ! -d "$dstdir" ]; then --defaultIFS=' --' --IFS="${IFS-${defaultIFS}}" -+ if test -d "$dst"; then -+ mkdircmd=: -+ chmodcmd= -+ else -+ mkdircmd=$mkdirprog -+ fi -+ else -+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command -+ # might cause directories to be created, which would be especially bad -+ # if $src (and thus $dsttmp) contains '*'. -+ if test ! -f "$src" && test ! -d "$src"; then -+ echo "$0: $src does not exist." >&2 -+ exit 1 -+ fi - --oIFS="${IFS}" --# Some sh's can't handle IFS=/ for some reason. --IFS='%' --set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` --IFS="${oIFS}" -+ if test -z "$dstarg"; then -+ echo "$0: no destination specified." >&2 -+ exit 1 -+ fi - --pathcomp='' -+ dst=$dstarg -+ # Protect names starting with `-'. -+ case $dst in -+ -*) dst=./$dst ;; -+ esac - --while [ $# -ne 0 ] ; do -- pathcomp="${pathcomp}${1}" -- shift -+ # If destination is a directory, append the input filename; won't work -+ # if double slashes aren't ignored. -+ if test -d "$dst"; then -+ if test -n "$no_target_directory"; then -+ echo "$0: $dstarg: Is a directory" >&2 -+ exit 1 -+ fi -+ dst=$dst/`basename "$src"` -+ fi -+ fi - -- if [ ! -d "${pathcomp}" ] ; -- then -- $mkdirprog "${pathcomp}" -- else -- true -- fi -+ # This sed command emulates the dirname command. -+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - -- pathcomp="${pathcomp}/" --done --fi -+ # Make sure that the destination directory exists. - --if [ x"$dir_arg" != x ] --then -- $doit $instcmd $dst && -+ # Skip lots of stat calls in the usual case. -+ if test ! -d "$dstdir"; then -+ defaultIFS=' -+ ' -+ IFS="${IFS-$defaultIFS}" - -- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && -- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && -- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && -- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi --else -+ oIFS=$IFS -+ # Some sh's can't handle IFS=/ for some reason. -+ IFS='%' -+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` -+ shift -+ IFS=$oIFS - --# If we're going to rename the final executable, determine the name now. -+ pathcomp= - -- if [ x"$transformarg" = x ] -- then -- dstfile=`basename $dst` -- else -- dstfile=`basename $dst $transformbasename | -- sed $transformarg`$transformbasename -- fi -+ while test $# -ne 0 ; do -+ pathcomp=$pathcomp$1 -+ shift -+ if test ! -d "$pathcomp"; then -+ $mkdirprog "$pathcomp" -+ # mkdir can fail with a `File exist' error in case several -+ # install-sh are creating the directory concurrently. This -+ # is OK. -+ test -d "$pathcomp" || exit -+ fi -+ pathcomp=$pathcomp/ -+ done -+ fi - --# don't allow the sed command to completely eliminate the filename -+ if test -n "$dir_arg"; then -+ $doit $mkdircmd "$dst" \ -+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ -+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ -+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ -+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - -- if [ x"$dstfile" = x ] -- then -- dstfile=`basename $dst` -- else -- true -- fi -+ else -+ dstfile=`basename "$dst"` - --# Make a temp file name in the proper directory. -+ # Make a couple of temp file names in the proper directory. -+ dsttmp=$dstdir/_inst.$$_ -+ rmtmp=$dstdir/_rm.$$_ - -- dsttmp=$dstdir/#inst.$$# -+ # Trap to clean up those temp files at exit. -+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 -+ trap '(exit $?); exit' 1 2 13 15 - --# Move or copy the file name to the temp name -+ # Copy the file name to the temp name. -+ $doit $cpprog "$src" "$dsttmp" && - -- $doit $instcmd $src $dsttmp && -+ # and set any options; do chmod last to preserve setuid bits. -+ # -+ # If any of these fail, we abort the whole thing. If we want to -+ # ignore errors from any of these, just make sure not to ignore -+ # errors from the above "$doit $cpprog $src $dsttmp" command. -+ # -+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ -+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ -+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ -+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - -- trap "rm -f ${dsttmp}" 0 && -+ # Now rename the file to the real destination. -+ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ -+ || { -+ # The rename failed, perhaps because mv can't rename something else -+ # to itself, or perhaps because mv is so ancient that it does not -+ # support -f. - --# and set any options; do chmod last to preserve setuid bits -+ # Now remove or move aside any old file at destination location. -+ # We try this two ways since rm can't unlink itself on some -+ # systems and the destination file might be busy for other -+ # reasons. In this case, the final cleanup might fail but the new -+ # file should still install successfully. -+ { -+ if test -f "$dstdir/$dstfile"; then -+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ -+ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ -+ || { -+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 -+ (exit 1); exit 1 -+ } -+ else -+ : -+ fi -+ } && - --# If any of these fail, we abort the whole thing. If we want to --# ignore errors from any of these, just make sure not to ignore --# errors from the above "$doit $instcmd $src $dsttmp" command. -+ # Now rename the file to the real destination. -+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" -+ } -+ } -+ fi || { (exit 1); exit 1; } -+done - -- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && -- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && -- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && -- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && -+# The final little trick to "correctly" pass the exit status to the exit trap. -+{ -+ (exit 0); exit 0 -+} - --# Now rename the file to the real destination. -- -- $doit $rmcmd -f $dstdir/$dstfile && -- $doit $mvcmd $dsttmp $dstdir/$dstfile -- --fi && -- -- --exit 0 -+# Local variables: -+# eval: (add-hook 'write-file-hooks 'time-stamp) -+# time-stamp-start: "scriptversion=" -+# time-stamp-format: "%:y-%02m-%02d.%02H" -+# time-stamp-end: "$" -+# End: ---- configure (revision 1905) -+++ configure (revision 1948) -@@ -278,15 +278,15 @@ - - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - if test -z "$ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if (echo_test_string="`eval $cmd`") 2>/dev/null && -- echo_test_string="`eval $cmd`" && -+ if (echo_test_string=`eval $cmd`) 2>/dev/null && -+ echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break -@@ -463,7 +463,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT mysqlconfig pgsqlconfig CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LIBOBJS USE_DM_GETOPT USE_DM_GETOPT_TRUE USE_DM_GETOPT_FALSE MYSQL_TRUE MYSQL_FALSE PGSQL_TRUE PGSQL_FALSE SIEVE_TRUE SIEVE_FALSE LDAP_TRUE LDAP_FALSE SQLLIB LDAPLIB SQLALIB SQLLTLIB SORTALIB SORTLTLIB AUTHALIB AUTHLTLIB SIEVELIB MYSQLINC PGSQLINC SIEVEINC LDAPINC build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT mysqlconfig pgsqlconfig CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBOBJS USE_DM_GETOPT USE_DM_GETOPT_TRUE USE_DM_GETOPT_FALSE MYSQL_TRUE MYSQL_FALSE PGSQL_TRUE PGSQL_FALSE SIEVE_TRUE SIEVE_FALSE LDAP_TRUE LDAP_FALSE SQLLIB LDAPLIB SQLALIB SQLLTLIB SORTALIB SORTLTLIB AUTHALIB AUTHLTLIB SIEVELIB MYSQLINC PGSQLINC SIEVEINC LDAPINC build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -1023,8 +1023,10 @@ - Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -- --enable-maintainer-mode enable make rules and dependencies not useful -- (and sometimes confusing) to the casual installer -+ --enable-maintainer-mode enable make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer -+ --disable-dependency-tracking speeds up one-time build -+ --enable-dependency-tracking do not reject slow dependency extractors - --enable-shared[=PKGS] - build shared libraries [default=yes] - --enable-static[=PKGS] -@@ -1526,22 +1528,9 @@ - ac_config_sub="$SHELL $ac_aux_dir/config.sub" - ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - -- - ac_config_headers="$ac_config_headers config.h:config.in" - -- ac_config_commands="$ac_config_commands default-1" -- --echo "$as_me:$LINENO: result: --This is dbmail's GNU configure script. --It's going to run a bunch of strange tests to hopefully --make your compile work without much twiddling. --" >&5 --echo "${ECHO_T} --This is dbmail's GNU configure script. --It's going to run a bunch of strange tests to hopefully --make your compile work without much twiddling. --" >&6 -- -+am__api_version="1.9" - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or - # incompatible versions: -@@ -1625,20 +1614,21 @@ - echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 - # Just in case - sleep 1 --echo timestamp > conftestfile -+echo timestamp > conftest.file - # Do `set' in a subshell so we don't clobber the current shell's - # arguments. Must try -L first in case configure is actually a - # symlink; some systems play weird games with the mod time of symlinks - # (eg FreeBSD returns the mod time of the symlink's containing - # directory). - if ( -- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` -+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. -- set X `ls -t $srcdir/configure conftestfile` -+ set X `ls -t $srcdir/configure conftest.file` - fi -- if test "$*" != "X $srcdir/configure conftestfile" \ -- && test "$*" != "X conftestfile $srcdir/configure"; then -+ rm -f conftest.file -+ if test "$*" != "X $srcdir/configure conftest.file" \ -+ && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a -@@ -1651,7 +1641,7 @@ - { (exit 1); exit 1; }; } - fi - -- test "$2" = conftestfile -+ test "$2" = conftest.file - ) - then - # Ok. -@@ -1663,7 +1653,6 @@ - Check your system clock" >&2;} - { (exit 1); exit 1; }; } - fi --rm -f conftest* - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - test "$program_prefix" != NONE && -@@ -1679,6 +1668,92 @@ - program_transform_name=`echo $program_transform_name | sed -f conftest.sed` - rm conftest.sed - -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` -+ -+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -+# Use eval to expand $SHELL -+if eval "$MISSING --run true"; then -+ am_missing_run="$MISSING --run " -+else -+ am_missing_run= -+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -+fi -+ -+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then -+ # We used to keeping the `.' as first argument, in order to -+ # allow $(mkdir_p) to be used without argument. As in -+ # $(mkdir_p) $(somedir) -+ # where $(somedir) is conditionally defined. However this is wrong -+ # for two reasons: -+ # 1. if the package is installed by a user who cannot write `.' -+ # make install will fail, -+ # 2. the above comment should most certainly read -+ # $(mkdir_p) $(DESTDIR)$(somedir) -+ # so it does not work when $(somedir) is undefined and -+ # $(DESTDIR) is not. -+ # To support the latter case, we have to write -+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), -+ # so the `.' trick is pointless. -+ mkdir_p='mkdir -p --' -+else -+ # On NextStep and OpenStep, the `mkdir' command does not -+ # recognize any option. It will interpret all options as -+ # directories to create, and then abort because `.' already -+ # exists. -+ for d in ./-p ./--version; -+ do -+ test -d $d && rmdir $d -+ done -+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. -+ if test -f "$ac_aux_dir/mkinstalldirs"; then -+ mkdir_p='$(mkinstalldirs)' -+ else -+ mkdir_p='$(install_sh) -d' -+ fi -+fi -+ -+for ac_prog in gawk mawk nawk awk -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_AWK+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$AWK"; then -+ ac_cv_prog_AWK="$AWK" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_AWK="$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+AWK=$ac_cv_prog_AWK -+if test -n "$AWK"; then -+ echo "$as_me:$LINENO: result: $AWK" >&5 -+echo "${ECHO_T}$AWK" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ test -n "$AWK" && break -+done -+ - echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 - echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 - set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -@@ -1708,17 +1783,38 @@ - SET_MAKE="MAKE=${MAKE-make}" - fi - -+rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. -+else -+ am__leading_dot=_ -+fi -+rmdir .tst 2>/dev/null - --PACKAGE=dbmail -- --VERSION=2.0.7 -- --if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then -+# test to see if srcdir already configured -+if test "`cd $srcdir && pwd`" != "`pwd`" && -+ test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 - echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } - fi - -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' -+ else -+ CYGPATH_W=echo -+ fi -+fi -+ -+ -+# Define the identity of the package. -+ PACKAGE=dbmail -+ VERSION=2.0.7 -+ -+ - cat >>confdefs.h <<_ACEOF - #define PACKAGE "$PACKAGE" - _ACEOF -@@ -1728,85 +1824,124 @@ - #define VERSION "$VERSION" - _ACEOF - -+# Some tools Automake needs. - -+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - --missing_dir=`cd $ac_aux_dir && pwd` --echo "$as_me:$LINENO: checking for working aclocal" >&5 --echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6 --# Run test in a subshell; some versions of sh will print an error if --# an executable is not found, even if stderr is redirected. --# Redirect stdin to placate older versions of autoconf. Sigh. --if (aclocal --version) < /dev/null > /dev/null 2>&1; then -- ACLOCAL=aclocal -- echo "$as_me:$LINENO: result: found" >&5 --echo "${ECHO_T}found" >&6 -+ -+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -+ -+ -+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} -+ -+ -+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} -+ -+ -+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -+ -+install_sh=${install_sh-"$am_aux_dir/install-sh"} -+ -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right -+# tool to use in cross-compilation environments, therefore Automake -+# will honor the `STRIP' environment variable to overrule this program. -+if test "$cross_compiling" != no; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -+set dummy ${ac_tool_prefix}strip; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_STRIP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ACLOCAL="$missing_dir/missing aclocal" -- echo "$as_me:$LINENO: result: missing" >&5 --echo "${ECHO_T}missing" >&6 -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_STRIP="${ac_tool_prefix}strip" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ - fi -- --echo "$as_me:$LINENO: checking for working autoconf" >&5 --echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6 --# Run test in a subshell; some versions of sh will print an error if --# an executable is not found, even if stderr is redirected. --# Redirect stdin to placate older versions of autoconf. Sigh. --if (autoconf --version) < /dev/null > /dev/null 2>&1; then -- AUTOCONF=autoconf -- echo "$as_me:$LINENO: result: found" >&5 --echo "${ECHO_T}found" >&6 -+fi -+STRIP=$ac_cv_prog_STRIP -+if test -n "$STRIP"; then -+ echo "$as_me:$LINENO: result: $STRIP" >&5 -+echo "${ECHO_T}$STRIP" >&6 - else -- AUTOCONF="$missing_dir/missing autoconf" -- echo "$as_me:$LINENO: result: missing" >&5 --echo "${ECHO_T}missing" >&6 -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:$LINENO: checking for working automake" >&5 --echo $ECHO_N "checking for working automake... $ECHO_C" >&6 --# Run test in a subshell; some versions of sh will print an error if --# an executable is not found, even if stderr is redirected. --# Redirect stdin to placate older versions of autoconf. Sigh. --if (automake --version) < /dev/null > /dev/null 2>&1; then -- AUTOMAKE=automake -- echo "$as_me:$LINENO: result: found" >&5 --echo "${ECHO_T}found" >&6 -+fi -+if test -z "$ac_cv_prog_STRIP"; then -+ ac_ct_STRIP=$STRIP -+ # Extract the first word of "strip", so it can be a program name with args. -+set dummy strip; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- AUTOMAKE="$missing_dir/missing automake" -- echo "$as_me:$LINENO: result: missing" >&5 --echo "${ECHO_T}missing" >&6 -+ if test -n "$ac_ct_STRIP"; then -+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_STRIP="strip" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" - fi -- --echo "$as_me:$LINENO: checking for working autoheader" >&5 --echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6 --# Run test in a subshell; some versions of sh will print an error if --# an executable is not found, even if stderr is redirected. --# Redirect stdin to placate older versions of autoconf. Sigh. --if (autoheader --version) < /dev/null > /dev/null 2>&1; then -- AUTOHEADER=autoheader -- echo "$as_me:$LINENO: result: found" >&5 --echo "${ECHO_T}found" >&6 -+fi -+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -+if test -n "$ac_ct_STRIP"; then -+ echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+echo "${ECHO_T}$ac_ct_STRIP" >&6 - else -- AUTOHEADER="$missing_dir/missing autoheader" -- echo "$as_me:$LINENO: result: missing" >&5 --echo "${ECHO_T}missing" >&6 -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:$LINENO: checking for working makeinfo" >&5 --echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6 --# Run test in a subshell; some versions of sh will print an error if --# an executable is not found, even if stderr is redirected. --# Redirect stdin to placate older versions of autoconf. Sigh. --if (makeinfo --version) < /dev/null > /dev/null 2>&1; then -- MAKEINFO=makeinfo -- echo "$as_me:$LINENO: result: found" >&5 --echo "${ECHO_T}found" >&6 -+ STRIP=$ac_ct_STRIP - else -- MAKEINFO="$missing_dir/missing makeinfo" -- echo "$as_me:$LINENO: result: missing" >&5 --echo "${ECHO_T}missing" >&6 -+ STRIP="$ac_cv_prog_STRIP" - fi - -+fi -+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" - -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+# Always define AMTAR for backward compatibility. -+ -+AMTAR=${AMTAR-"${am_missing_run}tar"} -+ -+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -+ -+ -+ -+ -+ - echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 - echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 - # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. -@@ -1827,6 +1962,7 @@ - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= - fi -+ - MAINT=$MAINTAINER_MODE_TRUE - - -@@ -2109,6 +2245,71 @@ - echo "${ECHO_T}using SQL authentication" >&6 - fi - -+DEPDIR="${am__leading_dot}deps" -+ -+ ac_config_commands="$ac_config_commands depfiles" -+ -+ -+am_make=${MAKE-make} -+cat > confinc << 'END' -+am__doit: -+ @echo done -+.PHONY: am__doit -+END -+# If we don't find an include directive, just comment out the code. -+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 -+am__include="#" -+am__quote= -+_am_result=none -+# First try GNU make style include. -+echo "include confinc" > confmf -+# We grep out `Entering directory' and `Leaving directory' -+# messages which can occur if `w' ends up in MAKEFLAGS. -+# In particular we don't look at `^make:' because GNU make might -+# be invoked under some other name (usually "gmake"), in which -+# case it prints its new name instead of `make'. -+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -+ am__include=include -+ am__quote= -+ _am_result=GNU -+fi -+# Now try BSD make style include. -+if test "$am__include" = "#"; then -+ echo '.include "confinc"' > confmf -+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -+ am__include=.include -+ am__quote="\"" -+ _am_result=BSD -+ fi -+fi -+ -+ -+echo "$as_me:$LINENO: result: $_am_result" >&5 -+echo "${ECHO_T}$_am_result" >&6 -+rm -f confinc confmf -+ -+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -+if test "${enable_dependency_tracking+set}" = set; then -+ enableval="$enable_dependency_tracking" -+ -+fi; -+if test "x$enable_dependency_tracking" != xno; then -+ am_depcomp="$ac_aux_dir/depcomp" -+ AMDEPBACKSLASH='\' -+fi -+ -+ -+if test "x$enable_dependency_tracking" != xno; then -+ AMDEP_TRUE= -+ AMDEP_FALSE='#' -+else -+ AMDEP_TRUE='#' -+ AMDEP_FALSE= -+fi -+ -+ -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -3033,7 +3234,116 @@ - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - -+depcc="$CC" am_compiler_list= - -+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_CC_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CC_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done -+ -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_CC_dependencies_compiler_type=none -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -+ -+ -+ -+if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then -+ am__fastdepCC_TRUE= -+ am__fastdepCC_FALSE='#' -+else -+ am__fastdepCC_TRUE='#' -+ am__fastdepCC_FALSE= -+fi -+ -+ -+ - # Look for libs needed to link to LDAP first - if test ! "${authldapheadername-x}" = "x" - then -@@ -5472,6 +5782,115 @@ - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - -+depcc="$CC" am_compiler_list= -+ -+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_CC_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CC_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done -+ -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_CC_dependencies_compiler_type=none -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -+ -+ -+ -+if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then -+ am__fastdepCC_TRUE= -+ am__fastdepCC_FALSE='#' -+else -+ am__fastdepCC_TRUE='#' -+ am__fastdepCC_FALSE= -+fi -+ -+ - echo "$as_me:$LINENO: checking maximum warning verbosity option" >&5 - echo $ECHO_N "checking maximum warning verbosity option... $ECHO_C" >&6 - if test -n "$CXX" -@@ -5684,6 +6103,7 @@ - fi - - -+ - if test -n "$MYSQLINC"; then - MYSQL_TRUE= - MYSQL_FALSE='#' -@@ -5693,6 +6113,7 @@ - fi - - -+ - if test -n "$PGSQLINC"; then - PGSQL_TRUE= - PGSQL_FALSE='#' -@@ -5702,6 +6123,7 @@ - fi - - -+ - if test -n "$SIEVEINC"; then - SIEVE_TRUE= - SIEVE_FALSE='#' -@@ -5711,6 +6133,7 @@ - fi - - -+ - if test -n "$LDAPINC"; then - LDAP_TRUE= - LDAP_FALSE='#' -@@ -5718,6 +6141,7 @@ - LDAP_TRUE='#' - LDAP_FALSE= - fi -+ - echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 - echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 - if test "${ac_cv_c_bigendian+set}" = set; then -@@ -6409,7 +6833,7 @@ - # Add /usr/xpg4/bin/sed as it is typically found on Solaris - # along with /bin/sed that truncates output. - for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -- test ! -f $lt_ac_sed && break -+ test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in -@@ -6434,10 +6858,10 @@ - fi - done - done --SED=$lt_cv_path_SED - - fi - -+SED=$lt_cv_path_SED - echo "$as_me:$LINENO: result: $SED" >&5 - echo "${ECHO_T}$SED" >&6 - -@@ -6499,7 +6923,7 @@ - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some GNU ld's only accept -v. -+ # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) -@@ -6533,7 +6957,7 @@ - if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # I'd rather use --version here, but apparently some GNU ld's only accept -v. -+ # I'd rather use --version here, but apparently some GNU lds only accept -v. - case `$LD -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes -@@ -6563,6 +6987,15 @@ - *) reload_flag=" $reload_flag" ;; - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' -+case $host_os in -+ darwin*) -+ if test "$GCC" = yes; then -+ reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs' -+ else -+ reload_cmds='$LD$reload_flag -o $output$reload_objs' -+ fi -+ ;; -+esac - - echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 - echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 -@@ -6649,7 +7082,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --bsdi4*) -+bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so -@@ -6672,13 +7105,13 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --freebsd* | kfreebsd*-gnu) -+freebsd* | kfreebsd*-gnu | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; -@@ -6694,7 +7127,7 @@ - - hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file -- case "$host_cpu" in -+ case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -@@ -6744,12 +7177,10 @@ - ;; - - openbsd*) -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else -- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - -@@ -6841,7 +7272,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 6844 "configure"' > conftest.$ac_ext -+ echo '#line 7275 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -6884,7 +7315,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- case "`/usr/bin/file conftest.o`" in -+ case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*linux*) -@@ -7502,7 +7933,121 @@ - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - --ac_ext=cc -+depcc="$CXX" am_compiler_list= -+ -+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_CXX_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CXX_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done -+ -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_CXX_dependencies_compiler_type=none -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 -+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type -+ -+ -+ -+if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then -+ am__fastdepCXX_TRUE= -+ am__fastdepCXX_FALSE='#' -+else -+ am__fastdepCXX_TRUE='#' -+ am__fastdepCXX_FALSE= -+fi -+ -+ -+ -+ -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cc - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -7732,7 +8277,9 @@ - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -+fi - -+ - ac_ext=f - ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' - ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -7825,7 +8372,7 @@ - - - # Provide some information about the compiler. --echo "$as_me:7828:" \ -+echo "$as_me:8375:" \ - "checking for Fortran 77 compiler version" >&5 - ac_compiler=`set X $ac_compile; echo $2` - { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 -@@ -8013,11 +8560,38 @@ - lt_cv_sys_max_cmd_len=8192; - ;; - -- *) -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. -- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && -@@ -8063,9 +8637,6 @@ - # Regexp to match symbols that can be accessed directly from C. - sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - --# Transform the above into a raw symbol and a C symbol. --symxfrm='\1 \2\3 \3' -- - # Transform an extracted symbol line into a proper C declaration - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - -@@ -8087,6 +8658,13 @@ - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -+linux*) -+ if test "$host_cpu" = ia64; then -+ symcode='[ABCDGIRSTW]' -+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ fi -+ ;; - irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; -@@ -8118,8 +8696,11 @@ - # Try without a prefix undercore, then with it. - for ac_symprfx in "" "_"; do - -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" -+ - # Write the raw and C identifiers. -- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -8281,7 +8862,7 @@ - - # Sed substitution that helps us do robust quoting. It backslashifies - # metacharacters that are still active within double-quoted strings. --Xsed='sed -e s/^X//' -+Xsed='sed -e 1s/^X//' - sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' - - # Same as above, but do not quote variable references. -@@ -8301,7 +8882,7 @@ - default_ofile=libtool - can_build_shared=yes - --# All known linkers require a `.a' archive for static linking (except M$VC, -+# All known linkers require a `.a' archive for static linking (except MSVC, - # which needs '.lib'). - libext=a - ltmain="$ac_aux_dir/ltmain.sh" -@@ -8586,6 +9167,17 @@ - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - fi - -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ - # Only perform the check for file, if the check method requires it - case $deplibs_check_method in - file_magic*) -@@ -8611,7 +9203,7 @@ - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) -- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then -@@ -8673,7 +9265,7 @@ - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) -- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then -@@ -8772,6 +9364,20 @@ - compiler=$CC - - -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+printf "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ - # - # Check for any special shared library compilation flags. - # -@@ -8808,11 +9414,16 @@ - LDFLAGS="$LDFLAGS $lt_prog_compiler_static" - printf "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -- # The compiler can only warn and ignore the option if not recognized -+ # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp -+ $SED '/^$/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_prog_compiler_static_works=yes -+ fi - else - lt_prog_compiler_static_works=yes - fi -@@ -8854,18 +9465,20 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8860: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9471: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8864: \$? = $ac_status" >&5 -+ echo "$as_me:9475: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test ! -s conftest.err; then -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp -+ $SED '/^$/d' conftest.err >conftest.er2 -+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi -@@ -8942,7 +9555,7 @@ - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -8968,6 +9581,16 @@ - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic='-qnocommon' -+ lt_prog_compiler_wl='-Wl,' -+ ;; -+ esac -+ ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being -@@ -8979,7 +9602,7 @@ - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -9003,12 +9626,19 @@ - ;; - - linux*) -- case $CC in -+ case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-fpic' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. -@@ -9029,9 +9659,14 @@ - ;; - - solaris*) -- lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl='-Wl,';; -+ esac - ;; - - sunos4*) -@@ -9053,6 +9688,11 @@ - fi - ;; - -+ unicos*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_can_build_shared=no -+ ;; -+ - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' -@@ -9087,18 +9727,20 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9093: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9733: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9097: \$? = $ac_status" >&5 -+ echo "$as_me:9737: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test ! -s conftest.err; then -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp -+ $SED '/^$/d' conftest.err >conftest.er2 -+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works=yes - fi - fi -@@ -9119,7 +9761,7 @@ - fi - - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= -@@ -9147,23 +9789,25 @@ - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9153: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9795: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9157: \$? = $ac_status" >&5 -+ echo "$as_me:9799: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- if test ! -s out/conftest.err; then -+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp -+ $SED '/^$/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi -- chmod u+w . -+ chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation -@@ -9239,6 +9883,16 @@ - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -9259,6 +9913,27 @@ - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) -@@ -9309,7 +9984,7 @@ - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -@@ -9327,6 +10002,38 @@ - fi - ;; - -+ linux*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ link_all_deplibs=no -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -9365,32 +10072,6 @@ - hardcode_shlibpath_var=no - ;; - -- linux*) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_cmds="$tmp_archive_cmds" -- supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -- *\ 2.11.*) ;; # other 2.11 versions -- *) supports_anon_versioning=yes ;; -- esac -- if test $supports_anon_versioning = yes; then -- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ --cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ --$echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -- else -- archive_expsym_cmds="$tmp_archive_cmds" -- fi -- link_all_deplibs=no -- else -- ld_shlibs=no -- fi -- ;; -- - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -@@ -9401,16 +10082,11 @@ - ;; - esac - -- if test "$ld_shlibs" = yes; then -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec='${wl}--export-dynamic' -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec= -- fi -+ if test "$ld_shlibs" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec= -+ export_dynamic_flag_spec= -+ whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) -@@ -9474,7 +10150,7 @@ - link_all_deplibs=yes - - if test "$GCC" = yes; then -- case $host_os in aix4.012|aix4.012.*) -+ case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -@@ -9495,6 +10171,9 @@ - fi - esac - shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -9639,7 +10318,7 @@ - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec=' ' - archive_cmds_need_lc=yes -- # This is similar to how AIX traditionally builds it's shared libraries. -+ # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi -@@ -9653,7 +10332,7 @@ - ld_shlibs=no - ;; - -- bsdi4*) -+ bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - -@@ -9679,52 +10358,52 @@ - ;; - - darwin* | rhapsody*) -- if test "$GXX" = yes ; then -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac - archive_cmds_need_lc=no -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag='-undefined suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag='-flat_namespace -undefined suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- allow_undefined_flag='-flat_namespace -undefined suppress' -- ;; -- 10.*) -- allow_undefined_flag='-undefined dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac -- lt_int_apple_cc_single_mod=no -- output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -- fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported -- whole_archive_flag_spec='-all_load $convenience' -+ whole_archive_flag_spec='' - link_all_deplibs=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else -- ld_shlibs=no -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs=no -+ ;; -+ esac - fi - ;; - -@@ -9758,7 +10437,7 @@ - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes -@@ -9783,7 +10462,7 @@ - - hpux10* | hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; -@@ -9792,7 +10471,7 @@ - ;; - esac - else -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' - ;; -@@ -9802,7 +10481,7 @@ - esac - fi - if test "$with_gnu_ld" = no; then -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' -@@ -9869,6 +10548,7 @@ - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else -@@ -9914,7 +10594,7 @@ - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' -@@ -9933,10 +10613,12 @@ - solaris*) - no_undefined_flag=' -z text' - if test "$GCC" = yes; then -+ wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else -+ wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -@@ -9945,8 +10627,18 @@ - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; -+ *) -+ # The compiler driver will combine linker options so we -+ # cannot just pass the convience library names through -+ # without $wl, iff we do not link with $LD. -+ # Luckily, gcc supports the same syntax we need for Sun Studio. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ case $wlarc in -+ '') -+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; -+ *) -+ whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; -+ esac ;; - esac - link_all_deplibs=yes - ;; -@@ -10220,7 +10912,7 @@ - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -10248,7 +10940,8 @@ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname' -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -10278,7 +10971,7 @@ - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; -@@ -10301,7 +10994,7 @@ - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH -- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -@@ -10336,8 +11029,17 @@ - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -10355,7 +11057,7 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- freebsd3.01* | freebsdelf3.01*) -+ freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -10382,7 +11084,7 @@ - version_type=sunos - need_lib_prefix=no - need_version=no -- case "$host_cpu" in -+ case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes -@@ -10481,7 +11183,7 @@ - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - -@@ -10556,7 +11258,11 @@ - openbsd*) - version_type=sunos - need_lib_prefix=no -- need_version=yes -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -10678,8 +11384,8 @@ - echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 - hardcode_action= - if test -n "$hardcode_libdir_flag_spec" || \ -- test -n "$runpath_var " || \ -- test "X$hardcode_automatic"="Xyes" ; then -+ test -n "$runpath_var" || \ -+ test "X$hardcode_automatic" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && -@@ -11338,7 +12044,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 11341 "configure" -+#line 12047 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11404,7 +12110,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -+ (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -@@ -11436,7 +12142,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 11439 "configure" -+#line 12145 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11502,7 +12208,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -+ (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; -@@ -11552,7 +12258,7 @@ - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. --case "$host_os" in -+case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then -@@ -11565,43 +12271,6 @@ - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -- ;; -- darwin* | rhapsody*) -- if test "$GCC" = yes; then -- archive_cmds_need_lc=no -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag='-undefined suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag='-flat_namespace -undefined suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- allow_undefined_flag='-flat_namespace -undefined suppress' -- ;; -- 10.*) -- allow_undefined_flag='-undefined dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac -- output_verbose_link_cmd='echo' -- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' -- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- hardcode_direct=no -- hardcode_automatic=yes -- hardcode_shlibpath_var=unsupported -- whole_archive_flag_spec='-all_load $convenience' -- link_all_deplibs=yes -- else -- ld_shlibs=no -- fi - ;; - esac - echo "$as_me:$LINENO: result: $enable_shared" >&5 -@@ -11731,7 +12400,7 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -11742,11 +12411,11 @@ - SED=$lt_SED - - # Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="$SED -e s/^X//" -+Xsed="$SED -e 1s/^X//" - - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - # The names of the tagged configurations supported by this script. - available_tags= -@@ -11776,7 +12445,13 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os - -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ - # An echo program that does not interpret backslashes. - echo=$lt_echo - -@@ -11852,7 +12527,7 @@ - # Does compiler simultaneously support -c and -o options? - compiler_c_o=$lt_lt_cv_prog_compiler_c_o - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -12147,7 +12822,9 @@ - - case $tagname in - CXX) -- if test -n "$CXX" && test "X$CXX" != "Xno"; then -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -12184,7 +12861,7 @@ - compiler_lib_search_path_CXX= - - # Source file extension for C++ test sources. --ac_ext=cc -+ac_ext=cpp - - # Object file extension for compiled C++ test sources. - objext=o -@@ -12205,6 +12882,20 @@ - compiler=$CC - - -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+printf "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_LD=$LD -@@ -12226,8 +12917,17 @@ - CC=${CXX-"c++"} - compiler=$CC - compiler_CXX=$CC --cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - -+ - # We don't want -fno-exception wen compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then -@@ -12297,7 +12997,7 @@ - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some GNU ld's only accept -v. -+ # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) -@@ -12331,7 +13031,7 @@ - if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # I'd rather use --version here, but apparently some GNU ld's only accept -v. -+ # I'd rather use --version here, but apparently some GNU lds only accept -v. - case `$LD -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes -@@ -12440,7 +13140,7 @@ - link_all_deplibs_CXX=yes - - if test "$GXX" = yes; then -- case $host_os in aix4.012|aix4.012.*) -+ case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -@@ -12461,6 +13161,9 @@ - fi - esac - shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -12606,7 +13309,7 @@ - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX=' ' - archive_cmds_need_lc_CXX=yes -- # This is similar to how AIX traditionally builds it's shared libraries. -+ # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi -@@ -12620,6 +13323,7 @@ - esac - ;; - -+ - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. -@@ -12643,65 +13347,76 @@ - ld_shlibs_CXX=no - fi - ;; -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc_CXX=no -+ hardcode_direct_CXX=no -+ hardcode_automatic_CXX=yes -+ hardcode_shlibpath_var_CXX=unsupported -+ whole_archive_flag_spec_CXX='' -+ link_all_deplibs_CXX=yes - -- darwin* | rhapsody*) -- if test "$GXX" = yes; then -- archive_cmds_need_lc_CXX=no -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag_CXX='-undefined suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag_CXX='-flat_namespace -undefined suppress' -+ if test "$GXX" = yes ; then -+ lt_int_apple_cc_single_mod=no -+ output_verbose_link_cmd='echo' -+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -+ lt_int_apple_cc_single_mod=yes -+ fi -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' - else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- allow_undefined_flag_CXX='-flat_namespace -undefined suppress' -- ;; -- 10.*) -- allow_undefined_flag_CXX='-undefined dynamic_lookup' -- ;; -- esac -+ archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ fi -+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_CXX=no -+ ;; -+ esac - fi -- ;; -- esac -- lt_int_apple_cc_single_mod=no -- output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -- fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ ;; - -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- hardcode_direct_CXX=no -- hardcode_automatic_CXX=yes -- hardcode_shlibpath_var_CXX=unsupported -- whole_archive_flag_spec_CXX='-all_load $convenience' -- link_all_deplibs_CXX=yes -- else -- ld_shlibs_CXX=no -- fi -- ;; -- - dgux*) - case $cc_basename in -- ec++) -+ ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- ghcx) -+ ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -12712,14 +13427,14 @@ - ;; - esac - ;; -- freebsd12*) -+ freebsd[12]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - ld_shlibs_CXX=no - ;; - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes -@@ -12736,11 +13451,11 @@ - # location of the library. - - case $cc_basename in -- CC) -+ CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- aCC) -+ aCC*) - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -12750,7 +13465,7 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then -@@ -12764,7 +13479,7 @@ - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld_CXX='+b $libdir' -@@ -12780,7 +13495,7 @@ - ;; - esac - fi -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no -@@ -12801,12 +13516,12 @@ - esac - - case $cc_basename in -- CC) -+ CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- aCC) -- case "$host_cpu" in -+ aCC*) -+ case $host_cpu in - hppa*64*|ia64*) - archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' - ;; -@@ -12827,7 +13542,7 @@ - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then -- case "$host_cpu" in -+ case $host_cpu in - ia64*|hppa*64*) - archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' - ;; -@@ -12845,9 +13560,9 @@ - ;; - irix5* | irix6*) - case $cc_basename in -- CC) -+ CC*) - # SGI C++ -- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is -@@ -12858,7 +13573,7 @@ - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi -@@ -12871,7 +13586,7 @@ - ;; - linux*) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file -@@ -12896,17 +13611,41 @@ - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; -- icpc) -+ icpc*) - # Intel C++ - with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac - archive_cmds_need_lc_CXX=no -- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; -- cxx) -+ pgCC*) -+ # Portland Group C++ compiler -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -@@ -12937,7 +13676,7 @@ - ;; - mvs*) - case $cc_basename in -- cxx) -+ cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -@@ -12958,9 +13697,25 @@ - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ ld_shlibs_CXX=no -+ ;; -+ openbsd*) -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ ;; - osf3*) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file -@@ -12976,14 +13731,14 @@ - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- cxx) -+ cxx*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: -@@ -13001,7 +13756,7 @@ - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: -@@ -13020,7 +13775,7 @@ - ;; - osf4* | osf5*) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file -@@ -13035,17 +13790,17 @@ - # the KAI C++ compiler. - old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- cxx) -+ cxx*) - allow_undefined_flag_CXX=' -expect_unresolved \*' -- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - hardcode_libdir_flag_spec_CXX='-rpath $libdir' -@@ -13064,7 +13819,7 @@ - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: -@@ -13088,7 +13843,7 @@ - sco*) - archive_cmds_need_lc_CXX=no - case $cc_basename in -- CC) -+ CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -@@ -13100,12 +13855,12 @@ - ;; - sunos4*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- lcc) -+ lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13118,36 +13873,33 @@ - ;; - solaris*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.2, 5.x and Centerline C++ -+ archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' -- archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in -- solaris2.0-5 | solaris2.0-5.*) ;; -+ solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system -- # linker. -+ # linker. We must also pass each convience library through -+ # to the system linker between allextract/defaultextract. -+ # The C++ compiler will combine linker options so we -+ # cannot just pass the convience library names through -+ # without $wl. - # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' - ;; - esac - link_all_deplibs_CXX=yes - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is -@@ -13155,7 +13907,7 @@ - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; -- gcx) -+ gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - -@@ -13198,7 +13950,7 @@ - ;; - tandem*) - case $cc_basename in -- NCC) -+ NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13251,7 +14003,7 @@ - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. -- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" -+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` - - for p in `eval $output_verbose_link_cmd`; do - case $p in -@@ -13327,6 +14079,20 @@ - - $rm -f confest.$objext - -+# PORTME: override above test on systems where it is broken -+case $host_os in -+solaris*) -+ case $cc_basename in -+ CC*) -+ # Adding this requires a known-good setup of shared libraries for -+ # Sun compiler versions before 5.6, else PIC objects from an old -+ # archive will be linked into the output, leading to subtle bugs. -+ postdeps_CXX='-lCstd -lCrun' -+ ;; -+ esac -+esac -+ -+ - case " $postdeps_CXX " in - *" -lc "*) archive_cmds_need_lc_CXX=no ;; - esac -@@ -13382,7 +14148,7 @@ - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - ;; - *) -@@ -13407,18 +14173,28 @@ - ;; - chorus*) - case $cc_basename in -- cxch68) -+ cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_CXX='-qnocommon' -+ lt_prog_compiler_wl_CXX='-Wl,' -+ ;; -+ esac -+ ;; - dgux*) - case $cc_basename in -- ec++) -+ ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; -- ghcx) -+ ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; -@@ -13426,22 +14202,22 @@ - ;; - esac - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in -- CC) -+ CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; -- aCC) -+ aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -13456,7 +14232,7 @@ - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in -- CC) -+ CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. -@@ -13467,18 +14243,24 @@ - ;; - linux*) - case $cc_basename in -- KCC) -+ KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; -- icpc) -+ icpc* | ecpc*) - # Intel C++ - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; -- cxx) -+ pgCC*) -+ # Portland Group C++ compiler. -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-fpic' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. -@@ -13495,7 +14277,7 @@ - ;; - mvs*) - case $cc_basename in -- cxx) -+ cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) -@@ -13506,14 +14288,14 @@ - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -- KCC) -+ KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; -- cxx) -+ cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha -@@ -13529,7 +14311,7 @@ - ;; - sco*) - case $cc_basename in -- CC) -+ CC*) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - *) -@@ -13538,13 +14320,13 @@ - ;; - solaris*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; -- gcx) -+ gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; -@@ -13554,12 +14336,12 @@ - ;; - sunos4*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; -- lcc) -+ lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; -@@ -13569,7 +14351,7 @@ - ;; - tandem*) - case $cc_basename in -- NCC) -+ NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; -@@ -13610,18 +14392,20 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13616: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14398: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:13620: \$? = $ac_status" >&5 -+ echo "$as_me:14402: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test ! -s conftest.err; then -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp -+ $SED '/^$/d' conftest.err >conftest.er2 -+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_CXX=yes - fi - fi -@@ -13642,7 +14426,7 @@ - fi - - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= -@@ -13670,23 +14454,25 @@ - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13676: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14460: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:13680: \$? = $ac_status" >&5 -+ echo "$as_me:14464: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- if test ! -s out/conftest.err; then -+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp -+ $SED '/^$/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi -- chmod u+w . -+ chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation -@@ -13741,7 +14527,7 @@ - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw*) -- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' - ;; - linux*) - link_all_deplibs_CXX=no -@@ -13924,7 +14710,7 @@ - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -13952,7 +14738,8 @@ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname' -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -13982,7 +14769,7 @@ - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; -@@ -14005,7 +14792,7 @@ - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH -- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -@@ -14040,8 +14827,17 @@ - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -14059,7 +14855,7 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- freebsd3.01* | freebsdelf3.01*) -+ freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -14086,7 +14882,7 @@ - version_type=sunos - need_lib_prefix=no - need_version=no -- case "$host_cpu" in -+ case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes -@@ -14185,7 +14981,7 @@ - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - -@@ -14260,7 +15056,11 @@ - openbsd*) - version_type=sunos - need_lib_prefix=no -- need_version=yes -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -14382,8 +15182,8 @@ - echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 - hardcode_action_CXX= - if test -n "$hardcode_libdir_flag_spec_CXX" || \ -- test -n "$runpath_var CXX" || \ -- test "X$hardcode_automatic_CXX"="Xyes" ; then -+ test -n "$runpath_var_CXX" || \ -+ test "X$hardcode_automatic_CXX" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && -@@ -15042,7 +15842,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 15045 "configure" -+#line 15845 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -15108,7 +15908,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -+ (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -@@ -15140,7 +15940,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 15143 "configure" -+#line 15943 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -15206,7 +16006,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -+ (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; -@@ -15358,7 +16158,13 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os - -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ - # An echo program that does not interpret backslashes. - echo=$lt_echo - -@@ -15434,7 +16240,7 @@ - # Does compiler simultaneously support -c and -o options? - compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -15715,13 +16521,36 @@ - compiler=$CC - - -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+printf "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - CC=${F77-"f77"} - compiler=$CC - compiler_F77=$CC --cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - -+ - echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 - echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $can_build_shared" >&5 -@@ -15733,7 +16562,7 @@ - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. --case "$host_os" in -+case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then -@@ -15742,7 +16571,9 @@ - fi - ;; - aix4* | aix5*) -- test "$enable_shared" = yes && enable_static=no -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi - ;; - esac - echo "$as_me:$LINENO: result: $enable_shared" >&5 -@@ -15819,7 +16650,7 @@ - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -15845,6 +16676,16 @@ - lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_F77='-qnocommon' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ esac -+ ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being -@@ -15856,7 +16697,7 @@ - lt_prog_compiler_wl_F77='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -15880,12 +16721,19 @@ - ;; - - linux*) -- case $CC in -+ case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-static' - ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-fpic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; - ccc*) - lt_prog_compiler_wl_F77='-Wl,' - # All Alpha code is PIC. -@@ -15906,9 +16754,14 @@ - ;; - - solaris*) -- lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl_F77='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl_F77='-Wl,';; -+ esac - ;; - - sunos4*) -@@ -15930,6 +16783,11 @@ - fi - ;; - -+ unicos*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_can_build_shared_F77=no -+ ;; -+ - uts4*) - lt_prog_compiler_pic_F77='-pic' - lt_prog_compiler_static_F77='-Bstatic' -@@ -15964,18 +16822,20 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15970: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16828: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:15974: \$? = $ac_status" >&5 -+ echo "$as_me:16832: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test ! -s conftest.err; then -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp -+ $SED '/^$/d' conftest.err >conftest.er2 -+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_F77=yes - fi - fi -@@ -15996,7 +16856,7 @@ - fi - - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_F77= -@@ -16024,23 +16884,25 @@ - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16030: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16890: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:16034: \$? = $ac_status" >&5 -+ echo "$as_me:16894: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- if test ! -s out/conftest.err; then -+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp -+ $SED '/^$/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_F77=yes - fi - fi -- chmod u+w . -+ chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation -@@ -16116,6 +16978,16 @@ - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -16136,6 +17008,27 @@ - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_F77='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_F77= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) -@@ -16186,7 +17079,7 @@ - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=no - enable_shared_with_static_runtimes_F77=yes -- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -@@ -16200,10 +17093,42 @@ - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - else -- ld_shlibs=no -+ ld_shlibs_F77=no - fi - ;; - -+ linux*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ link_all_deplibs_F77=no -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; -+ - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -16242,32 +17167,6 @@ - hardcode_shlibpath_var_F77=no - ;; - -- linux*) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_cmds_F77="$tmp_archive_cmds" -- supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -- *\ 2.11.*) ;; # other 2.11 versions -- *) supports_anon_versioning=yes ;; -- esac -- if test $supports_anon_versioning = yes; then -- archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ --cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ --$echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -- else -- archive_expsym_cmds_F77="$tmp_archive_cmds" -- fi -- link_all_deplibs_F77=no -- else -- ld_shlibs_F77=no -- fi -- ;; -- - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -@@ -16278,16 +17177,11 @@ - ;; - esac - -- if test "$ld_shlibs_F77" = yes; then -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec_F77='${wl}--export-dynamic' -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec_F77= -- fi -+ if test "$ld_shlibs_F77" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec_F77= -+ export_dynamic_flag_spec_F77= -+ whole_archive_flag_spec_F77= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) -@@ -16351,7 +17245,7 @@ - link_all_deplibs_F77=yes - - if test "$GCC" = yes; then -- case $host_os in aix4.012|aix4.012.*) -+ case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -@@ -16372,6 +17266,9 @@ - fi - esac - shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -16496,7 +17393,7 @@ - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_F77=' ' - archive_cmds_need_lc_F77=yes -- # This is similar to how AIX traditionally builds it's shared libraries. -+ # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi -@@ -16510,7 +17407,7 @@ - ld_shlibs_F77=no - ;; - -- bsdi4*) -+ bsdi[45]*) - export_dynamic_flag_spec_F77=-rdynamic - ;; - -@@ -16531,57 +17428,57 @@ - old_archive_From_new_cmds_F77='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -+ fix_srcfile_path_F77='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_F77=yes - ;; - - darwin* | rhapsody*) -- if test "$GXX" = yes ; then -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac - archive_cmds_need_lc_F77=no -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag_F77='-undefined suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag_F77='-flat_namespace -undefined suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- allow_undefined_flag_F77='-flat_namespace -undefined suppress' -- ;; -- 10.*) -- allow_undefined_flag_F77='-undefined dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac -- lt_int_apple_cc_single_mod=no -- output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -- fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct_F77=no - hardcode_automatic_F77=yes - hardcode_shlibpath_var_F77=unsupported -- whole_archive_flag_spec_F77='-all_load $convenience' -+ whole_archive_flag_spec_F77='' - link_all_deplibs_F77=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else -- ld_shlibs_F77=no -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_F77=no -+ ;; -+ esac - fi - ;; - -@@ -16615,7 +17512,7 @@ - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes -@@ -16640,7 +17537,7 @@ - - hpux10* | hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; -@@ -16649,7 +17546,7 @@ - ;; - esac - else -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' - ;; -@@ -16659,7 +17556,7 @@ - esac - fi - if test "$with_gnu_ld" = no; then -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*) - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld_F77='+b $libdir' -@@ -16726,6 +17623,7 @@ - hardcode_shlibpath_var_F77=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - else -@@ -16771,7 +17669,7 @@ - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_F77='-rpath $libdir' -@@ -16790,10 +17688,12 @@ - solaris*) - no_undefined_flag_F77=' -z text' - if test "$GCC" = yes; then -+ wlarc='${wl}' - archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else -+ wlarc='' - archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -@@ -16802,8 +17702,18 @@ - hardcode_shlibpath_var_F77=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; -+ *) -+ # The compiler driver will combine linker options so we -+ # cannot just pass the convience library names through -+ # without $wl, iff we do not link with $LD. -+ # Luckily, gcc supports the same syntax we need for Sun Studio. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ case $wlarc in -+ '') -+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; -+ *) -+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; -+ esac ;; - esac - link_all_deplibs_F77=yes - ;; -@@ -17077,7 +17987,7 @@ - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -17105,7 +18015,8 @@ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname' -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -17135,7 +18046,7 @@ - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; -@@ -17158,7 +18069,7 @@ - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH -- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -@@ -17193,8 +18104,17 @@ - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -17212,7 +18132,7 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- freebsd3.01* | freebsdelf3.01*) -+ freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -17239,7 +18159,7 @@ - version_type=sunos - need_lib_prefix=no - need_version=no -- case "$host_cpu" in -+ case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes -@@ -17338,7 +18258,7 @@ - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - -@@ -17413,7 +18333,11 @@ - openbsd*) - version_type=sunos - need_lib_prefix=no -- need_version=yes -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -17535,8 +18459,8 @@ - echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 - hardcode_action_F77= - if test -n "$hardcode_libdir_flag_spec_F77" || \ -- test -n "$runpath_var F77" || \ -- test "X$hardcode_automatic_F77"="Xyes" ; then -+ test -n "$runpath_var_F77" || \ -+ test "X$hardcode_automatic_F77" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_F77" != no && -@@ -17713,7 +18637,13 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os - -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ - # An echo program that does not interpret backslashes. - echo=$lt_echo - -@@ -17789,7 +18719,7 @@ - # Does compiler simultaneously support -c and -o options? - compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -18027,7 +18957,7 @@ - lt_simple_compile_test_code="class foo {}\n" - - # Code to be used in simple link tests --lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' -+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - -@@ -18038,16 +18968,42 @@ - compiler=$CC - - -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+printf "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - CC=${GCJ-"gcj"} - compiler=$CC - compiler_GCJ=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - -+ - # GCJ did not exist at the time GCC didn't implicitly link libc in. - archive_cmds_need_lc_GCJ=no - -+old_archive_cmds_GCJ=$old_archive_cmds - -+ - lt_prog_compiler_no_builtin_flag_GCJ= - - if test "$GCC" = yes; then -@@ -18069,18 +19025,20 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18075: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:19031: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18079: \$? = $ac_status" >&5 -+ echo "$as_me:19035: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test ! -s conftest.err; then -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp -+ $SED '/^$/d' conftest.err >conftest.er2 -+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi -@@ -18157,7 +19115,7 @@ - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -18183,6 +19141,16 @@ - lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_GCJ='-qnocommon' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ esac -+ ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being -@@ -18194,7 +19162,7 @@ - lt_prog_compiler_wl_GCJ='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -18218,12 +19186,19 @@ - ;; - - linux*) -- case $CC in -+ case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-static' - ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-fpic' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; - ccc*) - lt_prog_compiler_wl_GCJ='-Wl,' - # All Alpha code is PIC. -@@ -18244,9 +19219,14 @@ - ;; - - solaris*) -- lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl_GCJ='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl_GCJ='-Wl,';; -+ esac - ;; - - sunos4*) -@@ -18268,6 +19248,11 @@ - fi - ;; - -+ unicos*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_can_build_shared_GCJ=no -+ ;; -+ - uts4*) - lt_prog_compiler_pic_GCJ='-pic' - lt_prog_compiler_static_GCJ='-Bstatic' -@@ -18302,18 +19287,20 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18308: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:19293: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18312: \$? = $ac_status" >&5 -+ echo "$as_me:19297: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- if test ! -s conftest.err; then -+ # So say no if there are warnings other than the usual output. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp -+ $SED '/^$/d' conftest.err >conftest.er2 -+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then - lt_prog_compiler_pic_works_GCJ=yes - fi - fi -@@ -18334,7 +19321,7 @@ - fi - - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_GCJ= -@@ -18362,23 +19349,25 @@ - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18368: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:19355: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:18372: \$? = $ac_status" >&5 -+ echo "$as_me:19359: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- if test ! -s out/conftest.err; then -+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp -+ $SED '/^$/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_GCJ=yes - fi - fi -- chmod u+w . -+ chmod u+w . 2>&5 - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation -@@ -18454,6 +19443,16 @@ - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -18474,6 +19473,27 @@ - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_GCJ= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) -@@ -18524,7 +19544,7 @@ - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=no - enable_shared_with_static_runtimes_GCJ=yes -- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -@@ -18538,10 +19558,42 @@ - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - else -- ld_shlibs=no -+ ld_shlibs_GCJ=no - fi - ;; - -+ linux*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ link_all_deplibs_GCJ=no -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -18580,32 +19632,6 @@ - hardcode_shlibpath_var_GCJ=no - ;; - -- linux*) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_cmds_GCJ="$tmp_archive_cmds" -- supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -- *\ 2.11.*) ;; # other 2.11 versions -- *) supports_anon_versioning=yes ;; -- esac -- if test $supports_anon_versioning = yes; then -- archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ --cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ --$echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -- else -- archive_expsym_cmds_GCJ="$tmp_archive_cmds" -- fi -- link_all_deplibs_GCJ=no -- else -- ld_shlibs_GCJ=no -- fi -- ;; -- - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -@@ -18616,16 +19642,11 @@ - ;; - esac - -- if test "$ld_shlibs_GCJ" = yes; then -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec_GCJ= -- fi -+ if test "$ld_shlibs_GCJ" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec_GCJ= -+ export_dynamic_flag_spec_GCJ= -+ whole_archive_flag_spec_GCJ= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) -@@ -18689,7 +19710,7 @@ - link_all_deplibs_GCJ=yes - - if test "$GCC" = yes; then -- case $host_os in aix4.012|aix4.012.*) -+ case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -@@ -18710,6 +19731,9 @@ - fi - esac - shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -18854,7 +19878,7 @@ - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_GCJ=' ' - archive_cmds_need_lc_GCJ=yes -- # This is similar to how AIX traditionally builds it's shared libraries. -+ # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi -@@ -18868,7 +19892,7 @@ - ld_shlibs_GCJ=no - ;; - -- bsdi4*) -+ bsdi[45]*) - export_dynamic_flag_spec_GCJ=-rdynamic - ;; - -@@ -18889,57 +19913,57 @@ - old_archive_From_new_cmds_GCJ='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -+ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_GCJ=yes - ;; - - darwin* | rhapsody*) -- if test "$GXX" = yes ; then -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac - archive_cmds_need_lc_GCJ=no -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag_GCJ='-undefined suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress' -- ;; -- 10.*) -- allow_undefined_flag_GCJ='-undefined dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac -- lt_int_apple_cc_single_mod=no -- output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -- fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- else -- archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -- fi -- module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - hardcode_direct_GCJ=no - hardcode_automatic_GCJ=yes - hardcode_shlibpath_var_GCJ=unsupported -- whole_archive_flag_spec_GCJ='-all_load $convenience' -+ whole_archive_flag_spec_GCJ='' - link_all_deplibs_GCJ=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else -- ld_shlibs_GCJ=no -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' -+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_GCJ=no -+ ;; -+ esac - fi - ;; - -@@ -18973,7 +19997,7 @@ - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes -@@ -18998,7 +20022,7 @@ - - hpux10* | hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; -@@ -19007,7 +20031,7 @@ - ;; - esac - else -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' - ;; -@@ -19017,7 +20041,7 @@ - esac - fi - if test "$with_gnu_ld" = no; then -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*) - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' -@@ -19084,6 +20108,7 @@ - hardcode_shlibpath_var_GCJ=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' - else -@@ -19129,7 +20154,7 @@ - allow_undefined_flag_GCJ=' -expect_unresolved \*' - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_GCJ='-rpath $libdir' -@@ -19148,10 +20173,12 @@ - solaris*) - no_undefined_flag_GCJ=' -z text' - if test "$GCC" = yes; then -+ wlarc='${wl}' - archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else -+ wlarc='' - archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -@@ -19160,8 +20187,18 @@ - hardcode_shlibpath_var_GCJ=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; -+ *) -+ # The compiler driver will combine linker options so we -+ # cannot just pass the convience library names through -+ # without $wl, iff we do not link with $LD. -+ # Luckily, gcc supports the same syntax we need for Sun Studio. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ case $wlarc in -+ '') -+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; -+ *) -+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; -+ esac ;; - esac - link_all_deplibs_GCJ=yes - ;; -@@ -19435,7 +20472,7 @@ - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -19463,7 +20500,8 @@ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname' -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -19493,7 +20531,7 @@ - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; -@@ -19516,7 +20554,7 @@ - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH -- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -@@ -19551,8 +20589,17 @@ - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -19570,7 +20617,7 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- freebsd3.01* | freebsdelf3.01*) -+ freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -@@ -19597,7 +20644,7 @@ - version_type=sunos - need_lib_prefix=no - need_version=no -- case "$host_cpu" in -+ case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes -@@ -19696,7 +20743,7 @@ - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then -- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - -@@ -19771,7 +20818,11 @@ - openbsd*) - version_type=sunos - need_lib_prefix=no -- need_version=yes -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -19893,8 +20944,8 @@ - echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 - hardcode_action_GCJ= - if test -n "$hardcode_libdir_flag_spec_GCJ" || \ -- test -n "$runpath_var GCJ" || \ -- test "X$hardcode_automatic_GCJ"="Xyes" ; then -+ test -n "$runpath_var_GCJ" || \ -+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_GCJ" != no && -@@ -20553,7 +21604,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 20556 "configure" -+#line 21607 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -20619,7 +21670,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -+ (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -@@ -20651,7 +21702,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 20654 "configure" -+#line 21705 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -20717,7 +21768,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -+ (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; -@@ -20869,7 +21920,13 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os - -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ - # An echo program that does not interpret backslashes. - echo=$lt_echo - -@@ -20945,7 +22002,7 @@ - # Does compiler simultaneously support -c and -o options? - compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -21193,11 +22250,35 @@ - compiler=$CC - - -+# save warnings/boilerplate of simple test code -+ac_outfile=conftest.$ac_objext -+printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ac_outfile=conftest.$ac_objext -+printf "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - CC=${RC-"windres"} - compiler=$CC - compiler_RC=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ - lt_cv_prog_compiler_c_o_RC=yes - - # The else clause should only fire when bootstrapping the -@@ -21314,7 +22395,13 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os - -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ - # An echo program that does not interpret backslashes. - echo=$lt_echo - -@@ -21390,7 +22477,7 @@ - # Does compiler simultaneously support -c and -o options? - compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -21758,6 +22845,76 @@ - LTLIBOBJS=$ac_ltlibobjs - - -+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"AMDEP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${USE_DM_GETOPT_TRUE}" && test -z "${USE_DM_GETOPT_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"USE_DM_GETOPT\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"USE_DM_GETOPT\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${MYSQL_TRUE}" && test -z "${MYSQL_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"MYSQL\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"MYSQL\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${PGSQL_TRUE}" && test -z "${PGSQL_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"PGSQL\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"PGSQL\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${SIEVE_TRUE}" && test -z "${SIEVE_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"SIEVE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"SIEVE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${LDAP_TRUE}" && test -z "${LDAP_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"LDAP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"LDAP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - - : ${CONFIG_STATUS=./config.status} - ac_clean_files_save=$ac_clean_files -@@ -22191,8 +23348,8 @@ - # INIT-COMMANDS section. - # - -+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - -- - _ACEOF - - -@@ -22208,7 +23365,7 @@ - "auth/Makefile" ) CONFIG_FILES="$CONFIG_FILES auth/Makefile" ;; - "sort/Makefile" ) CONFIG_FILES="$CONFIG_FILES sort/Makefile" ;; - "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; -- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; -+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -@@ -22298,6 +23455,7 @@ - s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t - s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t - s,@INSTALL_DATA@,$INSTALL_DATA,;t t -+s,@CYGPATH_W@,$CYGPATH_W,;t t - s,@PACKAGE@,$PACKAGE,;t t - s,@VERSION@,$VERSION,;t t - s,@ACLOCAL@,$ACLOCAL,;t t -@@ -22305,7 +23463,17 @@ - s,@AUTOMAKE@,$AUTOMAKE,;t t - s,@AUTOHEADER@,$AUTOHEADER,;t t - s,@MAKEINFO@,$MAKEINFO,;t t -+s,@install_sh@,$install_sh,;t t -+s,@STRIP@,$STRIP,;t t -+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -+s,@mkdir_p@,$mkdir_p,;t t -+s,@AWK@,$AWK,;t t - s,@SET_MAKE@,$SET_MAKE,;t t -+s,@am__leading_dot@,$am__leading_dot,;t t -+s,@AMTAR@,$AMTAR,;t t -+s,@am__tar@,$am__tar,;t t -+s,@am__untar@,$am__untar,;t t - s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t - s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t - s,@MAINT@,$MAINT,;t t -@@ -22318,6 +23486,15 @@ - s,@ac_ct_CC@,$ac_ct_CC,;t t - s,@EXEEXT@,$EXEEXT,;t t - s,@OBJEXT@,$OBJEXT,;t t -+s,@DEPDIR@,$DEPDIR,;t t -+s,@am__include@,$am__include,;t t -+s,@am__quote@,$am__quote,;t t -+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -+s,@CCDEPMODE@,$CCDEPMODE,;t t -+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t - s,@CPP@,$CPP,;t t - s,@EGREP@,$EGREP,;t t - s,@LIBOBJS@,$LIBOBJS,;t t -@@ -22359,11 +23536,12 @@ - s,@ac_ct_AR@,$ac_ct_AR,;t t - s,@RANLIB@,$RANLIB,;t t - s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@STRIP@,$STRIP,;t t --s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t - s,@CXX@,$CXX,;t t - s,@CXXFLAGS@,$CXXFLAGS,;t t - s,@ac_ct_CXX@,$ac_ct_CXX,;t t -+s,@CXXDEPMODE@,$CXXDEPMODE,;t t -+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t - s,@CXXCPP@,$CXXCPP,;t t - s,@F77@,$F77,;t t - s,@FFLAGS@,$FFLAGS,;t t -@@ -22830,7 +24008,29 @@ - cat $tmp/config.h - rm -f $tmp/config.h - fi -+# Compute $ac_file's index in $config_headers. -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $ac_file | $ac_file:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; -+ esac - done -+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || -+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X$ac_file : 'X\(//\)[^/]' \| \ -+ X$ac_file : 'X\(//\)$' \| \ -+ X$ac_file : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X$ac_file | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'`/stamp-h$_am_stamp_count -+done - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - -@@ -22946,7 +24146,91 @@ - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 - echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in -- default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;; -+ depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do -+ # Strip MF so we end up with the name of the file. -+ mf=`echo "$mf" | sed -e 's/:.*$//'` -+ # Check whether this is an Automake generated Makefile or not. -+ # We used to match only the files named `Makefile.in', but -+ # some people rename them; so instead we look at the file content. -+ # Grep'ing the first line is not enough: some people post-process -+ # each Makefile.in and add a new line on top of each file to say so. -+ # So let's grep whole file. -+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -+ dirpart=`(dirname "$mf") 2>/dev/null || -+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$mf" : 'X\(//\)[^/]' \| \ -+ X"$mf" : 'X\(//\)$' \| \ -+ X"$mf" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$mf" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ else -+ continue -+ fi -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -+ test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -+ # When using ansi2knr, U may be empty or an underscore; expand it -+ U=`sed -n 's/^U = //p' < "$mf"` -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ # Make sure the directory exists. -+ test -f "$dirpart/$file" && continue -+ fdir=`(dirname "$file") 2>/dev/null || -+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$file" : 'X\(//\)[^/]' \| \ -+ X"$file" : 'X\(//\)$' \| \ -+ X"$file" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ { if $as_mkdir_p; then -+ mkdir -p $dirpart/$fdir -+ else -+ as_dir=$dirpart/$fdir -+ as_dirs= -+ while test ! -d "$as_dir"; do -+ as_dirs="$as_dir $as_dirs" -+ as_dir=`(dirname "$as_dir") 2>/dev/null || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ done -+ test ! -n "$as_dirs" || mkdir $as_dirs -+ fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} -+ { (exit 1); exit 1; }; }; } -+ -+ # echo "creating $dirpart/$file" -+ echo '# dummy' > "$dirpart/$file" -+ done -+done -+ ;; - esac - done - _ACEOF ---- INSTALL.dbmail (revision 0) -+++ INSTALL.dbmail (revision 1948) -@@ -0,0 +1,210 @@ -+/* $Id: INSTALL 1606 2005-02-23 15:46:03Z paul $ -+ (c) 2000-2002 IC&S, The Netherlands */ -+ -+DBMAIL installation -+=================== -+ -+This file describes the installation of DBMail. To read about extra -+features in dbmail you should consult the EXTRAS file. -+Remember, DBmail is easy to install, as long as you exactly follow -+these instructions. -+ -+What do you need? -+ -+- a working mysql (> 4.0.14) or postgresql installation -+- a working smtp server (Postfix, Exim, QMail or Sendmail) -+- the DBMail source (www.dbmail.org) -+- GNU Make. On Linux systems, your standard 'make' program is GNU Make. On -+ *BSD systems, make sure you install and use 'gmake'. -+- development files (libs, scripts and include files) for your database -+ server. These will probably be provided by separate packages. -+ -+ -+1. Setup a database -+ -+ Currently, DBMail supports both MySQL and PostgreSQL for mailstorage. -+ MySQL is supported from version 4.0.14 upwards. Earlier versions of -+ MySQL lack some SQL features that are needed for DBMail, like support -+ for the INSERT...SELECT statement. -+ -+ Mysql setup -+ ----------- -+ -+ Note: Since some DBMail tables can get VERY large (depending on your -+ mailusage) we advise using InnoDB as database storage backend. -+ -+ First you'll need to create the DBMail database in MYSQL. You can -+ do this by issueing the following command. This step is only -+ necessary when you do not have a database for DBMail yet. Note that -+ you will be prompted for the MySQL root password. -+ -+ mysqladmin create dbmail -u root -p -+ -+ This creates a database with the name "dbmail". Now you have to give -+ a non-root user access to this database. Start the MySQL command-line -+ client as root: -+ -+ mysql -u root -p -+ -+ and enter the following command: -+ -+ GRANT ALL ON dbmail.* to dbmail@localhost identified by '<pass>' -+ -+ Where <pass> should be replaced with the password you want for -+ the dbmail user. After this step, the database is ready to be -+ used by the dbmail user. The next step is the creation of the -+ database tables used by DBMail. Log out of the MySQL client and run -+ the following command from the command line. You will have to -+ enter the password you set in the previous step. -+ -+ mysql -u dbmail dbmail -p < sql/mysql/create_tables_innoDB.mysql -+ -+ If you cannot use InnoDB, replace creates_table_innoDB.mysql by -+ create_tables.mysql. This is not recommended though. In future -+ versions, DBMail will only support MySQL with transaction support, -+ which is only given by InnoDB at the moment. -+ -+ After this, the DBMAIL tables will have been created and we can go -+ on to the compilation and installation of DBMail itself. -+ -+ Postgresql setup -+ ---------------- -+ -+ First you need to create the postgresql user dbmail is going to use. -+ This is done by. Note that this command can only be performed by -+ user postgres or another PostgreSQL user with the privileges to -+ create users and and databases. -+ -+ createuser -U postgres dbmail -+ -+ Off course you can use an other username than dbmail, simply replace -+ it. You can set a password for the user by doing a: -+ -+ ALTER USER dbmail WITH PASSWORD '<password>'; -+ -+ In a postgresql console, with <password> replaced by the actual -+ password you want to use. After doing this you should create the -+ database for dbmail: -+ -+ createdb -U dbmail dbmail -+ -+ The first dbmail is the user you just created, the second the name of -+ the database. Of course you can use an other databasename. After -+ setting up the user and database it's time to create the tables, do a: -+ -+ psql -U dbmail dbmail < sql/postgresql/create_tables.pgsql -+ -+ Don't forget to start postgresql with the -i option, so it accepts -+ TCP/IP connections. -+ -+2. Set the database settings -+ -+ Copy the dbmail.conf file to /etc -+ Edit the dbmail.conf file and set everything in there -+ to your likeings. -+ -+ Make sure to set your database name, user and host are configured -+ in dbmail.conf. Other options in the configuration file are -+ documented there. -+ -+3. Run configure & make -+ Run the configure script. This script uses pg_config or mysql_config -+ (depending on --with-mysql or --with-pgsql) to detect where the -+ libraries and include files for these databases are. -+ -+ e.g. when working with PostgreSQL, this is the configure command: -+ -+ ./configure --with-pgsql -+ -+ After running configure, 'make all' will build the executables. -+ -+ Running 'make install' will install the executables in /usr/local/sbin -+ -+4. Create users in the dbmail system -+ -+ Next you will need to create some users into the dbmail mailing sytem. -+ Currently this can be done in two ways. One way is using the -+ dbmail-users utility. The other way is doing it in the database -+ itself. To do it using the dbmail-users utility and do the following: -+ -+ dbmail-users -a <username> -w <password> -g <clientid>\ -+ -m <maxmail> [-s aliases] -+ -+ clientid can be left 0 (this is if you want certain mailadministrators -+ administer specific groups of mailusers). maxmail is the maximum -+ number of bytes this user may have in his/her mailboxes. 0 is -+ unlimited. Add K or M for kilobytes and megabytes. Aliases are a -+ number of aliases for this user. @domain are domain aliases. -+ A user always needs to have at least one alias to receive mail, unless -+ the users username is something like foo@bar.org, where bar.org is -+ a domain the mailserver deliveres to. -+ -+ example: -+ ./dbmail-users -a john -w secret -g 0 -m 25M\ -+ -s john@dude.org john@dude.net @net.com -+ -+ This will create a user john, with a password secret. It will set -+ john's maillimit 25 Mb and all mail for john@dude.org, john@dude.net -+ and @net.com will be sent to john. The @net.com is a fallback alias. -+ This means that all mail that cannot be delivered to an existing alias -+ for a @net.com address will sent to john. -+ -+5. Configure your MTA -+ -+ There are two ways to connect your MTA to DBMail. The MTA can start a -+ dbmail-smtp process and pipe SMTP commands and messages to it, or it -+ can use lmtp (Local Mail Transport Protocol) to deliver via -+ dbmail-lmtpd. LMTP is the preferred solution because it offers more -+ robust error handling and because it is a daemon, high traffic servers -+ will have reduced delays which would be incurred starting up a -+ dbmail-smtp process for each message. -+ -+ The specifics of delivering to DBMail from your MTA can be found in -+ the INSTALL.<MTA Name> files. Currently there is documentation for -+ Postfix and Exim. -+ -+ If you use a different kind of mta that we do not have documentation -+ for: The dbmail injector program, dbmail-smtp, can receive information -+ in two ways. Either through raw mail (for example, delivered by -+ procmail) using the -n option or from a MTA with recipients in the -+ commandline using the -d option. Be carefull, the -n option is not -+ fully tested and may behave unexected. If possible use the -d option. -+ -+ Setup for LMTP should be straightforward if your MTA supports it. -+ -+6. Setting up the maintenance run -+ -+ The dbmail daemons and the smtp injector itself will never actually -+ delete mail from the database. The only program that will do this is -+ the dbmail-util program. This program will also check the -+ integrity of the dbmail database and, if nescessary, fix it. The -+ dbmail-util program will first delete all messages that are set -+ for final deletion. After that it will set all messages that have the -+ delete status set to status final deletion. This way dbmail always -+ has a backup based upon the interval difference between maintenance -+ jobs. We recommend running the dbmail-util program in a daily -+ interval from cron: -+ -+ 0 3 * * * /usr/local/sbin/dbmail-util -cturpd -l 24h -qq -+ -+7. Starting the servers -+ -+ If you want users to be able to retrieve email via IMAP or POP3, run -+ dbmail-imapd and/or dbmail-pop3d. If you are delivering email via -+ LMTP, run dbmail-lmtpd (you should start LMTP before your MTA!). -+ -+8. Problems -+ -------- -+ For problems you can subscribe to the dbmail mailinglist: -+ http://mailman.fastxs.nl/mailman/listinfo/dbmail -+ -+ Please always check the archives first. -+ -+ or check out the dbmail website at http://www.dbmail.org. -+ -+ Please note that DBMail logs a lot of relevant data to the maillog -+ (often located at /var/log/maillog or /var/log/mail.log). This can -+ help you often if something is not working, e.g. if there's no -+ connection to the database. -+ -+ ---- INSTALL (revision 1905) -+++ INSTALL (revision 1948) -@@ -1,210 +1,236 @@ --/* $Id$ -- (c) 2000-2002 IC&S, The Netherlands */ -+Installation Instructions -+************************* - --DBMAIL installation --=================== -+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -+Software Foundation, Inc. - --This file describes the installation of DBMail. To read about extra --features in dbmail you should consult the EXTRAS file. --Remember, DBmail is easy to install, as long as you exactly follow --these instructions. -+This file is free documentation; the Free Software Foundation gives -+unlimited permission to copy, distribute and modify it. - --What do you need? -+Basic Installation -+================== - --- a working mysql (> 4.0.14) or postgresql installation --- a working smtp server (Postfix, Exim, QMail or Sendmail) --- the DBMail source (www.dbmail.org) --- GNU Make. On Linux systems, your standard 'make' program is GNU Make. On -- *BSD systems, make sure you install and use 'gmake'. --- development files (libs, scripts and include files) for your database -- server. These will probably be provided by separate packages. -- -+These are generic installation instructions. - --1. Setup a database -+ The `configure' shell script attempts to guess correct values for -+various system-dependent variables used during compilation. It uses -+those values to create a `Makefile' in each directory of the package. -+It may also create one or more `.h' files containing system-dependent -+definitions. Finally, it creates a shell script `config.status' that -+you can run in the future to recreate the current configuration, and a -+file `config.log' containing compiler output (useful mainly for -+debugging `configure'). - -- Currently, DBMail supports both MySQL and PostgreSQL for mailstorage. -- MySQL is supported from version 4.0.14 upwards. Earlier versions of -- MySQL lack some SQL features that are needed for DBMail, like support -- for the INSERT...SELECT statement. -+ It can also use an optional file (typically called `config.cache' -+and enabled with `--cache-file=config.cache' or simply `-C') that saves -+the results of its tests to speed up reconfiguring. (Caching is -+disabled by default to prevent problems with accidental use of stale -+cache files.) - -- Mysql setup -- ----------- -+ If you need to do unusual things to compile the package, please try -+to figure out how `configure' could check whether to do them, and mail -+diffs or instructions to the address given in the `README' so they can -+be considered for the next release. If you are using the cache, and at -+some point `config.cache' contains results you don't want to keep, you -+may remove or edit it. - -- Note: Since some DBMail tables can get VERY large (depending on your -- mailusage) we advise using InnoDB as database storage backend. -- -- First you'll need to create the DBMail database in MYSQL. You can -- do this by issueing the following command. This step is only -- necessary when you do not have a database for DBMail yet. Note that -- you will be prompted for the MySQL root password. -+ The file `configure.ac' (or `configure.in') is used to create -+`configure' by a program called `autoconf'. You only need -+`configure.ac' if you want to change it or regenerate `configure' using -+a newer version of `autoconf'. - -- mysqladmin create dbmail -u root -p -+The simplest way to compile this package is: - -- This creates a database with the name "dbmail". Now you have to give -- a non-root user access to this database. Start the MySQL command-line -- client as root: -+ 1. `cd' to the directory containing the package's source code and type -+ `./configure' to configure the package for your system. If you're -+ using `csh' on an old version of System V, you might need to type -+ `sh ./configure' instead to prevent `csh' from trying to execute -+ `configure' itself. - -- mysql -u root -p -+ Running `configure' takes awhile. While running, it prints some -+ messages telling which features it is checking for. - -- and enter the following command: -+ 2. Type `make' to compile the package. - -- GRANT ALL ON dbmail.* to dbmail@localhost identified by '<pass>' -+ 3. Optionally, type `make check' to run any self-tests that come with -+ the package. - -- Where <pass> should be replaced with the password you want for -- the dbmail user. After this step, the database is ready to be -- used by the dbmail user. The next step is the creation of the -- database tables used by DBMail. Log out of the MySQL client and run -- the following command from the command line. You will have to -- enter the password you set in the previous step. -+ 4. Type `make install' to install the programs and any data files and -+ documentation. - -- mysql -u dbmail dbmail -p < sql/mysql/create_tables_innoDB.mysql -+ 5. You can remove the program binaries and object files from the -+ source code directory by typing `make clean'. To also remove the -+ files that `configure' created (so you can compile the package for -+ a different kind of computer), type `make distclean'. There is -+ also a `make maintainer-clean' target, but that is intended mainly -+ for the package's developers. If you use it, you may have to get -+ all sorts of other programs in order to regenerate files that came -+ with the distribution. - -- If you cannot use InnoDB, replace creates_table_innoDB.mysql by -- create_tables.mysql. This is not recommended though. In future -- versions, DBMail will only support MySQL with transaction support, -- which is only given by InnoDB at the moment. -- -- After this, the DBMAIL tables will have been created and we can go -- on to the compilation and installation of DBMail itself. -+Compilers and Options -+===================== - -- Postgresql setup -- ---------------- -- -- First you need to create the postgresql user dbmail is going to use. -- This is done by. Note that this command can only be performed by -- user postgres or another PostgreSQL user with the privileges to -- create users and and databases. -+Some systems require unusual options for compilation or linking that the -+`configure' script does not know about. Run `./configure --help' for -+details on some of the pertinent environment variables. - -- createuser -U postgres dbmail -+ You can give `configure' initial values for configuration parameters -+by setting variables in the command line or in the environment. Here -+is an example: - -- Off course you can use an other username than dbmail, simply replace -- it. You can set a password for the user by doing a: -+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - -- ALTER USER dbmail WITH PASSWORD '<password>'; -+ *Note Defining Variables::, for more details. - -- In a postgresql console, with <password> replaced by the actual -- password you want to use. After doing this you should create the -- database for dbmail: -+Compiling For Multiple Architectures -+==================================== - -- createdb -U dbmail dbmail -+You can compile the package for more than one kind of computer at the -+same time, by placing the object files for each architecture in their -+own directory. To do this, you must use a version of `make' that -+supports the `VPATH' variable, such as GNU `make'. `cd' to the -+directory where you want the object files and executables to go and run -+the `configure' script. `configure' automatically checks for the -+source code in the directory that `configure' is in and in `..'. - -- The first dbmail is the user you just created, the second the name of -- the database. Of course you can use an other databasename. After -- setting up the user and database it's time to create the tables, do a: -+ If you have to use a `make' that does not support the `VPATH' -+variable, you have to compile the package for one architecture at a -+time in the source code directory. After you have installed the -+package for one architecture, use `make distclean' before reconfiguring -+for another architecture. - -- psql -U dbmail dbmail < sql/postgresql/create_tables.pgsql -+Installation Names -+================== - -- Don't forget to start postgresql with the -i option, so it accepts -- TCP/IP connections. -+By default, `make install' installs the package's commands under -+`/usr/local/bin', include files under `/usr/local/include', etc. You -+can specify an installation prefix other than `/usr/local' by giving -+`configure' the option `--prefix=PREFIX'. - --2. Set the database settings -+ You can specify separate installation prefixes for -+architecture-specific files and architecture-independent files. If you -+pass the option `--exec-prefix=PREFIX' to `configure', the package uses -+PREFIX as the prefix for installing programs and libraries. -+Documentation and other data files still use the regular prefix. - -- Copy the dbmail.conf file to /etc -- Edit the dbmail.conf file and set everything in there -- to your likeings. -+ In addition, if you use an unusual directory layout you can give -+options like `--bindir=DIR' to specify different values for particular -+kinds of files. Run `configure --help' for a list of the directories -+you can set and what kinds of files go in them. - -- Make sure to set your database name, user and host are configured -- in dbmail.conf. Other options in the configuration file are -- documented there. -+ If the package supports it, you can cause programs to be installed -+with an extra prefix or suffix on their names by giving `configure' the -+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - --3. Run configure & make -- Run the configure script. This script uses pg_config or mysql_config -- (depending on --with-mysql or --with-pgsql) to detect where the -- libraries and include files for these databases are. -+Optional Features -+================= - -- e.g. when working with PostgreSQL, this is the configure command: -+Some packages pay attention to `--enable-FEATURE' options to -+`configure', where FEATURE indicates an optional part of the package. -+They may also pay attention to `--with-PACKAGE' options, where PACKAGE -+is something like `gnu-as' or `x' (for the X Window System). The -+`README' should mention any `--enable-' and `--with-' options that the -+package recognizes. - -- ./configure --with-pgsql -+ For packages that use the X Window System, `configure' can usually -+find the X include and library files automatically, but if it doesn't, -+you can use the `configure' options `--x-includes=DIR' and -+`--x-libraries=DIR' to specify their locations. - -- After running configure, 'make all' will build the executables. -- -- Running 'make install' will install the executables in /usr/local/sbin -+Specifying the System Type -+========================== - --4. Create users in the dbmail system -+There may be some features `configure' cannot figure out automatically, -+but needs to determine by the type of machine the package will run on. -+Usually, assuming the package is built to be run on the _same_ -+architectures, `configure' can figure that out, but if it prints a -+message saying it cannot guess the machine type, give it the -+`--build=TYPE' option. TYPE can either be a short name for the system -+type, such as `sun4', or a canonical name which has the form: - -- Next you will need to create some users into the dbmail mailing sytem. -- Currently this can be done in two ways. One way is using the -- dbmail-users utility. The other way is doing it in the database -- itself. To do it using the dbmail-users utility and do the following: -+ CPU-COMPANY-SYSTEM - -- dbmail-users -a <username> -w <password> -g <clientid>\ -- -m <maxmail> [-s aliases] -- -- clientid can be left 0 (this is if you want certain mailadministrators -- administer specific groups of mailusers). maxmail is the maximum -- number of bytes this user may have in his/her mailboxes. 0 is -- unlimited. Add K or M for kilobytes and megabytes. Aliases are a -- number of aliases for this user. @domain are domain aliases. -- A user always needs to have at least one alias to receive mail, unless -- the users username is something like foo@bar.org, where bar.org is -- a domain the mailserver deliveres to. -- -- example: -- ./dbmail-users -a john -w secret -g 0 -m 25M\ -- -s john@dude.org john@dude.net @net.com -- -- This will create a user john, with a password secret. It will set -- john's maillimit 25 Mb and all mail for john@dude.org, john@dude.net -- and @net.com will be sent to john. The @net.com is a fallback alias. -- This means that all mail that cannot be delivered to an existing alias -- for a @net.com address will sent to john. -+where SYSTEM can have one of these forms: - --5. Configure your MTA -+ OS KERNEL-OS - -- There are two ways to connect your MTA to DBMail. The MTA can start a -- dbmail-smtp process and pipe SMTP commands and messages to it, or it -- can use lmtp (Local Mail Transport Protocol) to deliver via -- dbmail-lmtpd. LMTP is the preferred solution because it offers more -- robust error handling and because it is a daemon, high traffic servers -- will have reduced delays which would be incurred starting up a -- dbmail-smtp process for each message. -+ See the file `config.sub' for the possible values of each field. If -+`config.sub' isn't included in this package, then this package doesn't -+need to know the machine type. - -- The specifics of delivering to DBMail from your MTA can be found in -- the INSTALL.<MTA Name> files. Currently there is documentation for -- Postfix and Exim. -+ If you are _building_ compiler tools for cross-compiling, you should -+use the option `--target=TYPE' to select the type of system they will -+produce code for. - -- If you use a different kind of mta that we do not have documentation -- for: The dbmail injector program, dbmail-smtp, can receive information -- in two ways. Either through raw mail (for example, delivered by -- procmail) using the -n option or from a MTA with recipients in the -- commandline using the -d option. Be carefull, the -n option is not -- fully tested and may behave unexected. If possible use the -d option. -+ If you want to _use_ a cross compiler, that generates code for a -+platform different from the build platform, you should specify the -+"host" platform (i.e., that on which the generated programs will -+eventually be run) with `--host=TYPE'. - -- Setup for LMTP should be straightforward if your MTA supports it. -+Sharing Defaults -+================ - --6. Setting up the maintenance run -+If you want to set default values for `configure' scripts to share, you -+can create a site shell script called `config.site' that gives default -+values for variables like `CC', `cache_file', and `prefix'. -+`configure' looks for `PREFIX/share/config.site' if it exists, then -+`PREFIX/etc/config.site' if it exists. Or, you can set the -+`CONFIG_SITE' environment variable to the location of the site script. -+A warning: not all `configure' scripts look for a site script. - -- The dbmail daemons and the smtp injector itself will never actually -- delete mail from the database. The only program that will do this is -- the dbmail-util program. This program will also check the -- integrity of the dbmail database and, if nescessary, fix it. The -- dbmail-util program will first delete all messages that are set -- for final deletion. After that it will set all messages that have the -- delete status set to status final deletion. This way dbmail always -- has a backup based upon the interval difference between maintenance -- jobs. We recommend running the dbmail-util program in a daily -- interval from cron: -+Defining Variables -+================== - -- 0 3 * * * /usr/local/sbin/dbmail-util -cturpd -l 24h -qq -- --7. Starting the servers -+Variables not defined in a site shell script can be set in the -+environment passed to `configure'. However, some packages may run -+configure again during the build, and the customized values of these -+variables may be lost. In order to avoid this problem, you should set -+them in the `configure' command line, using `VAR=value'. For example: - -- If you want users to be able to retrieve email via IMAP or POP3, run -- dbmail-imapd and/or dbmail-pop3d. If you are delivering email via -- LMTP, run dbmail-lmtpd (you should start LMTP before your MTA!). -+ ./configure CC=/usr/local2/bin/gcc - --8. Problems -- -------- -- For problems you can subscribe to the dbmail mailinglist: -- http://mailman.fastxs.nl/mailman/listinfo/dbmail -- -- Please always check the archives first. -+causes the specified `gcc' to be used as the C compiler (unless it is -+overridden in the site shell script). Here is a another example: - -- or check out the dbmail website at http://www.dbmail.org. -+ /bin/bash ./configure CONFIG_SHELL=/bin/bash - -- Please note that DBMail logs a lot of relevant data to the maillog -- (often located at /var/log/maillog or /var/log/mail.log). This can -- help you often if something is not working, e.g. if there's no -- connection to the database. -+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -+configuration-related scripts to be executed by `/bin/bash'. - -+`configure' Invocation -+====================== - -+`configure' recognizes the following options to control how it operates. -+ -+`--help' -+`-h' -+ Print a summary of the options to `configure', and exit. -+ -+`--version' -+`-V' -+ Print the version of Autoconf used to generate the `configure' -+ script, and exit. -+ -+`--cache-file=FILE' -+ Enable the cache: use and save the results of the tests in FILE, -+ traditionally `config.cache'. FILE defaults to `/dev/null' to -+ disable caching. -+ -+`--config-cache' -+`-C' -+ Alias for `--cache-file=config.cache'. -+ -+`--quiet' -+`--silent' -+`-q' -+ Do not print messages saying which checks are being made. To -+ suppress all normal output, redirect it to `/dev/null' (any error -+ messages will still be shown). -+ -+`--srcdir=DIR' -+ Look for the package's source code in directory DIR. Usually -+ `configure' can determine that directory automatically. -+ -+`configure' also accepts some other, not widely useful, options. Run -+`configure --help' for more details. -+ ---- acinclude.m4 (revision 1905) -+++ acinclude.m4 (revision 1948) -@@ -4,138 +4,9 @@ - - # serial 1 - --dnl Usage: --dnl AM_INIT_AUTOMAKE(package,version, [no-define]) -- --AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_REQUIRE([AC_PROG_INSTALL]) --PACKAGE=[$1] --AC_SUBST(PACKAGE) --VERSION=[$2] --AC_SUBST(VERSION) --dnl test to see if srcdir already configured --if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) --fi --ifelse([$3],, --AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) --AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) --AC_REQUIRE([AM_SANITY_CHECK]) --AC_REQUIRE([AC_ARG_PROGRAM]) --dnl FIXME This is truly gross. --missing_dir=`cd $ac_aux_dir && pwd` --AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) --AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) --AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) --AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) --AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) --AC_REQUIRE([AC_PROG_MAKE_SET])]) -- --# --# Check to make sure that the build environment is sane. --# -- --AC_DEFUN([AM_SANITY_CHECK], --[AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftestfile --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` -- if test "[$]*" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftestfile` -- fi -- if test "[$]*" != "X $srcdir/configure conftestfile" \ -- && test "[$]*" != "X conftestfile $srcdir/configure"; then -- -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken --alias in your environment]) -- fi -- -- test "[$]2" = conftestfile -- ) --then -- # Ok. -- : --else -- AC_MSG_ERROR([newly created file is older than distributed files! --Check your system clock]) --fi --rm -f conftest* --AC_MSG_RESULT(yes)]) -- --dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) --dnl The program must properly implement --version. --AC_DEFUN([AM_MISSING_PROG], --[AC_MSG_CHECKING(for working $2) --# Run test in a subshell; some versions of sh will print an error if --# an executable is not found, even if stderr is redirected. --# Redirect stdin to placate older versions of autoconf. Sigh. --if ($2 --version) < /dev/null > /dev/null 2>&1; then -- $1=$2 -- AC_MSG_RESULT(found) --else -- $1="$3/missing $2" -- AC_MSG_RESULT(missing) --fi --AC_SUBST($1)]) -- --# Add --enable-maintainer-mode option to configure. --# From Jim Meyering -- --# serial 1 -- --AC_DEFUN([AM_MAINTAINER_MODE], --[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -- dnl maintainer-mode is disabled by default -- AC_ARG_ENABLE(maintainer-mode, --[ --enable-maintainer-mode enable make rules and dependencies not useful -- (and sometimes confusing) to the casual installer], -- USE_MAINTAINER_MODE=$enableval, -- USE_MAINTAINER_MODE=no) -- AC_MSG_RESULT($USE_MAINTAINER_MODE) -- AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) -- MAINT=$MAINTAINER_MODE_TRUE -- AC_SUBST(MAINT)dnl --] --) -- --# Define a conditional. -- --AC_DEFUN([AM_CONDITIONAL], --[AC_SUBST($1_TRUE) --AC_SUBST($1_FALSE) --if $2; then -- $1_TRUE= -- $1_FALSE='#' --else -- $1_TRUE='#' -- $1_FALSE= --fi]) -- --dnl DBMAIL_MSG_CONFIGURE_START() --dnl --AC_DEFUN(DBMAIL_MSG_CONFIGURE_START, [dnl --AC_MSG_RESULT([ --This is dbmail's GNU configure script. --It's going to run a bunch of strange tests to hopefully --make your compile work without much twiddling. --]) --]) -- - dnl DBMAIL_BOTH_SQL_CHECK - dnl --AC_DEFUN(DBMAIL_BOTH_SQL_CHECK, [dnl -+AC_DEFUN([DBMAIL_BOTH_SQL_CHECK], [dnl - AC_ARG_WITH(mysql, - [ --with-mysql use MySQL as database. Uses mysql_config - for finding includes and libraries], -@@ -187,7 +58,7 @@ - - dnl DBMAIL_CHECK_SQL_LIBS - dnl --AC_DEFUN(DBMAIL_CHECK_SQL_LIBS, [dnl -+AC_DEFUN([DBMAIL_CHECK_SQL_LIBS], [dnl - #Look for include files and libs needed to link - #use the configuration utilities (mysql_config and pg_config for this) - # MySQL first -@@ -231,7 +102,7 @@ - ]) - dnl DBMAIL_SIEVE_CONF - dnl check for ldap or sql authentication --AC_DEFUN(DBMAIL_SIEVE_CONF, [dnl -+AC_DEFUN([DBMAIL_SIEVE_CONF], [dnl - AC_MSG_RESULT([checking for sorting configuration]) - AC_ARG_WITH(sieve,[ --with-sieve=PATH full path to libSieve header directory (don't use, not stable)], - sieveheadername="$withval$") -@@ -287,7 +158,7 @@ - - dnl DBMAIL_CHECK_SIEVE_LIBS - dnl --AC_DEFUN(DBMAIL_CHECK_SIEVE_LIBS, [dnl -+AC_DEFUN([DBMAIL_CHECK_SIEVE_LIBS], [dnl - # Look for libs needed to link to SIEVE first - if test ! "${sieveheadername-x}" = "x" - then -@@ -307,7 +178,7 @@ - - dnl DBMAIL_AUTH_CONF - dnl check for ldap or sql authentication --AC_DEFUN(DBMAIL_AUTH_CONF, [dnl -+AC_DEFUN([DBMAIL_AUTH_CONF], [dnl - AC_MSG_RESULT([checking for authentication configuration]) - AC_ARG_WITH(auth-ldap,[ --with-auth-ldap=PATH full path to ldap header directory], - authldapheadername="$withval$") -@@ -363,7 +234,7 @@ - - dnl DBMAIL_CHECK_LDAP_LIBS - dnl --AC_DEFUN(DBMAIL_CHECK_LDAP_LIBS, [dnl -+AC_DEFUN([DBMAIL_CHECK_LDAP_LIBS], [dnl - # Look for libs needed to link to LDAP first - if test ! "${authldapheadername-x}" = "x" - then |