Use libtool for built ARGP and libmailutils

+2002-02-13  Jeff Bailey  <jbailey@outpost.dnsalias.org>
+
+        This change permits linking on systems that don't support
+	interlibrary dependancies inherently like SCO Openserver.
+
+	* sieve/Makefile.am: Link in libtool-based libmailutils.
+
+	* readmsg/Makefile.am: Link in libtool-based libmailutils.
+
+	* pop3d/Makefile.am: Link in libtool-based libmailutils.
+
+	* mh/Makefile.am: Link in libtool-based libmailutils.
+
+	* messages/Makefile.am: Link in libtool-based libmailutils.
+
+	* mapi/Makefile.am: Link in libtool-based libmailutils.
+
+	* mail.local/Makefile.am: Link in libtool-based libmailutils.
+
+	* mail/Makefile.am: Link in libtool-based libmailutils.
+
+	* lib/Makefile.am: Generate libtool-based libmailutils.
+
+	* lib/.cvsignore: Add files that libtool generates
+
+	* imap4d/Makefile.am: Link in libtool-based libmailutils.
+
+	* guimb/Makefile.am: Link in libtool-based libmailutils.
+
+	* from/Makefile.am: Link in libtool-based libmailutils.
+
+	* frm/Makefile.am: Link in libtool-based libmailutils.
+
+	* argp/Makefile.am: Use libtool
+
+	* configure.in: Build libtool ARGP libraries
+
 2002-02-11  Sergey Poznyakoff 
 
 	* imap4d/auth_gss.c (auth_gssapi): Use imap4d_gss_userok() to

@@ -2,16 +2,16 @@ AUTOMAKE_OPTIONS = ../lib/ansi2knr
 
 INCLUDES = -I${top_srcdir}/lib
 
-noinst_LIBRARIES =  @ARGPLIB@
+noinst_LTLIBRARIES =  @ARGPLIB@
 
-libargp_a_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c argp-fs-xinl.c \
+libargp_la_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c argp-fs-xinl.c \
  argp-help.c argp-parse.c argp-pv.c argp-pvh.c argp-xinl.c pin.c
 
 EXTRA_DIST =
 
-EXTRA_LIBRARIES = libargp.a
+EXTRA_LTLIBRARIES = libargp.la
 
 noinst_HEADERS = argp-fmtstream.h argp-namefrob.h argp.h
 
-libargp_a_LIBADD = ../lib/libmailutils.a
+libargp_la_LIBADD = ../lib/libmailutils.la
 

@@ -181,8 +181,8 @@ dnl Check for libraries
 AC_CHECK_FUNCS(argp_parse)
 if test x"$ac_cv_func_argp_parse" != xyes; then
 	AC_REPLACE_FUNCS(strndup strnlen strchrnul)
-	ARGPLIBS="../argp/libargp.a"
-	ARGPLIB="libargp.a"
+	ARGPLIBS="../argp/libargp.la"
+	ARGPLIB="libargp.la"
 	ARGPINCS='-I$(top_srcdir)/argp'
 	AC_SUBST(ARGPLIBS)
 	AC_SUBST(ARGPLIB)

@@ -4,4 +4,4 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
 bin_PROGRAMS = frm
 
 frm_DEPENDENCIES = ../mailbox/libmailbox.la
-frm_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.a
+frm_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la

@@ -4,4 +4,4 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
 bin_PROGRAMS = from
 
 from_DEPENDENCIES = ../mailbox/libmailbox.la
-from_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.a
+from_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la

@@ -8,5 +8,5 @@ bin_PROGRAMS=@GUIMB@
 EXTRA_PROGRAMS=guimb
 guimb_SOURCES=main.c collect.c util.c guimb.h 
 guimb_LDADD = ../libmu_scm/libmu_scm.a ../mailbox/libmailbox.la \
- ../lib/libmailutils.a @GUILE_LIBS@ 
+ ../lib/libmailutils.la @GUILE_LIBS@ 
 

@@ -3,12 +3,12 @@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @ARGPINCS@ @AUTHINCS@
 
 sbin_PROGRAMS =	imap4d
 
-imap4d_LDADD = @AUTHOBJS@ @ARGPLIBS@ ../mailbox/libmailbox.la  @AUTHLIBS@ ../lib/libmailutils.a
+imap4d_LDADD = @AUTHOBJS@ @ARGPLIBS@ ../mailbox/libmailbox.la  @AUTHLIBS@ ../lib/libmailutils.la
 imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \
  commands.c copy.c create.c delete.c examine.c expunge.c fetch.c imap4d.c \
  imap4d.h list.c logout.c login.c lsub.c namespace.c noop.c rename.c search.c \
  select.c signal.c status.c store.c subscribe.c sync.c uid.c unsubscribe.c \
  util.c
-imap4d_DEPENDENCIES = @AUTHOBJS@ ../mailbox/libmailbox.la ../lib/libmailutils.a
+imap4d_DEPENDENCIES = @AUTHOBJS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
 
 EXTRA_DIST=auth_gss.c

 Makefile.in
 Makefile
 .deps
+.libs
+*.lo
+libmailutils.la

 AUTOMAKE_OPTIONS = ansi2knr
-noinst_LIBRARIES = libmailutils.a
+noinst_LTLIBRARIES = libmailutils.la
 
 SUBDIRS = posix
 
 INCLUDES = -I${top_srcdir}/include @ARGPINCS@
-libmailutils_a_SOURCES = basename.c daemon.c getopt.c getopt1.c md5.c \
+libmailutils_la_SOURCES = basename.c daemon.c getopt.c getopt1.c md5.c \
                          mu_dbm.c getline.c xstrdup.c xmalloc.c argcv.c \
                          mu_argp.c
 
@@ -15,5 +15,5 @@ EXTRA_DIST = alloca.c fnmatch.c fgetpwent.c getpass.c malloc.c obstack.c \
 noinst_HEADERS = argcv.h error.h fnmatch.h getline.h getopt.h md5.h mu_dbm.h\
  regex.h snprintf.h xalloc.h xstrtol.h obstack.h mu_argp.h
 
-libmailutils_a_LIBADD = @LIBOBJS@ @ALLOCA@
+libmailutils_la_LIBADD = @LIBOBJS@ @ALLOCA@
 

@@ -5,7 +5,7 @@ libexec_PROGRAMS = mail.local
 mail_local_SOURCES = main.c mailquota.c script.c mail.local.h
 
 mail_local_LDADD = @ARGPLIBS@ @LIBMU_SCM@ ../mailbox/libmailbox.la \
- @AUTHLIBS@ ../lib/libmailutils.a @GUILE_LIBS@ 
+ @AUTHLIBS@ ../lib/libmailutils.la @GUILE_LIBS@ 
  
 
 install-exec-hook:

@@ -5,7 +5,7 @@ AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
 
 bin_PROGRAMS = mail
 
-mail_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.a \
+mail_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la \
              @READLINE_LIBS@
 
 EXTRA_DIST = msgset.c

@@ -11,7 +11,7 @@ lib_LTLIBRARIES = libmapi.la
 /* FIXME:  This should be part of the default includes.  */
 EXTRA_DIST = mapi.h
 
-libmapi_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.a
+libmapi_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
 
 libmapi_la_SOURCES = \
  MAPIAddress.c \

@@ -4,4 +4,4 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @ARGPINCS@
 bin_PROGRAMS = messages
 
 messages_DEPENDENCIES = ../mailbox/libmailbox.la
-messages_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.a
+messages_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la

@@ -11,7 +11,7 @@ noinst_HEADERS = mh.h mh_getopt.h
 scan_SOURCES = scan.c
 inc_SOURCES = inc.c
 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @ARGPINCS@
-mh_LIBS = ./libmh.a @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.a
+mh_LIBS = ./libmh.a @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
 scan_LDADD = $(mh_LIBS)  -lcurses -ltermcap
 inc_LDADD = $(mh_LIBS)
 YFLAGS=-vt

@@ -9,7 +9,7 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
  list.c lock.c noop.c quit.c retr.c rset.c stat.c signal.c top.c uidl.c \
  user.c virtual.c
 
-pop3d_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.a 
+pop3d_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la 
 
 popauth_SOURCES = popauth.c
-popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.a
+popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la

@@ -5,4 +5,4 @@ bin_PROGRAMS = readmsg
 
 readmsg_SOURCES = readmsg.c msglist.c readmsg.h
 readmsg_DEPENDENCIES = ../mailbox/libmailbox.la
-readmsg_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.a
+readmsg_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la

@@ -55,7 +55,7 @@ HDR = \
   util.h
 
 sieve_DEPENDENCIES = ../mailbox/libmailbox.la
-sieve_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.a
+sieve_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
 sieve_SOURCES = \
   sieve.c \
   ${SRC} $(HDR)