X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.in;h=c0c684bd414f236618354bc0ead42842f137dcb1;hp=3367db6c8db883dec21d31ae758c7ada0ffb9a7c;hb=7a65e5ebdec7a76fb26412022bd1e5ef739e53f2;hpb=cfd46a622a446af8a5fa286637cd88259f1b50a5

diff --git a/Makefile.in b/Makefile.in
index 3367db6..c0c684b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,6 +133,8 @@ SMIMEAUX_TARGET = @SMIMEAUX_TARGET@
 STRIP = @STRIP@
 SUBVERSION = @SUBVERSION@
 U = @U@
+USE_GNUTLS_FALSE = @USE_GNUTLS_FALSE@
+USE_GNUTLS_TRUE = @USE_GNUTLS_TRUE@
 USE_GSS_FALSE = @USE_GSS_FALSE@
 USE_GSS_TRUE = @USE_GSS_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
@@ -194,10 +196,10 @@ bin_SCRIPTS = muttbug flea
 
 BUILT_SOURCES = keymap_defs.h patchlist.c
 
-bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
-mutt_SOURCES = $(BUILT_SOURCES) \
+bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
+muttng_SOURCES = $(BUILT_SOURCES) \
 	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
-        crypt.c cryptglue.c \
+	compress.c crypt.c cryptglue.c \
 	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
 	edit.c enter.c flags.c init.c filter.c from.c getdomain.c \
 	handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
@@ -207,14 +209,14 @@ mutt_SOURCES = $(BUILT_SOURCES) \
 	score.c send.c sendlib.c signal.c sort.c \
 	status.c system.c thread.c charset.c history.c lib.c \
 	muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \
-	url.c ascii.c mutt_idna.c sidebar.c
+	url.c ascii.c mutt_idna.c sidebar.c hcache.c
 
 
-mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
+muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
 	$(INTLLIBS) $(LIBICONV)
 
 
-mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
+muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
 	$(INTLDEPS)
 
 
@@ -224,7 +226,7 @@ makedoc_DEPENDENCIES =
 
 INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
 
-EXTRA_mutt_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
+EXTRA_muttng_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
 	mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \
 	pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
 	browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \
@@ -234,6 +236,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
 
 EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
 	configure acconfig.h account.h \
+	compress.h \
 	attach.h buffy.h charset.h copy.h dotlock.h functions.h gen_defs \
 	globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
 	mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
@@ -242,7 +245,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
 	rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare \
 	nntp.h ChangeLog.nntp \
 	_regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \
-	mbyte.h	lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttrc.head Muttrc \
+	mbyte.h	lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \
 	makedoc.c stamp-doc-rc README.SSL smime.h\
 	muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh	\
 	ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
@@ -269,42 +272,43 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = intl/Makefile doc/Makefile contrib/Makefile \
-	muttbug.sh Muttrc.head doc/instdoc.sh
+	muttbug.sh Muttngrc.head doc/instdoc.sh
 EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) makedoc$(EXEEXT)
-bin_PROGRAMS = mutt$(EXEEXT) @DOTLOCK_TARGET@ @PGPAUX_TARGET@ \
+bin_PROGRAMS = muttng$(EXEEXT) @DOTLOCK_TARGET@ @PGPAUX_TARGET@ \
 	@SMIMEAUX_TARGET@
 PROGRAMS = $(bin_PROGRAMS)
 
 am_makedoc_OBJECTS = makedoc.$(OBJEXT)
 makedoc_OBJECTS = $(am_makedoc_OBJECTS)
 makedoc_LDFLAGS =
-am__objects_1 = patchlist.$(OBJEXT)
-am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \
-	attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \
-	buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \
-	cryptglue.$(OBJEXT) commands.$(OBJEXT) complete.$(OBJEXT) \
-	compose.$(OBJEXT) copy.$(OBJEXT) curs_lib.$(OBJEXT) \
-	curs_main.$(OBJEXT) date.$(OBJEXT) edit.$(OBJEXT) \
-	enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) filter.$(OBJEXT) \
-	from.$(OBJEXT) getdomain.$(OBJEXT) handler.$(OBJEXT) \
-	hash.$(OBJEXT) hdrline.$(OBJEXT) headers.$(OBJEXT) \
-	help.$(OBJEXT) hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) \
-	mbox.$(OBJEXT) menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) \
-	pager.$(OBJEXT) parse.$(OBJEXT) pattern.$(OBJEXT) \
-	postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \
-	recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \
-	rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) score.$(OBJEXT) \
-	send.$(OBJEXT) sendlib.$(OBJEXT) signal.$(OBJEXT) \
-	sort.$(OBJEXT) status.$(OBJEXT) system.$(OBJEXT) \
-	thread.$(OBJEXT) charset.$(OBJEXT) history.$(OBJEXT) \
-	lib.$(OBJEXT) muttlib.$(OBJEXT) editmsg.$(OBJEXT) \
-	utf8.$(OBJEXT) mbyte.$(OBJEXT) wcwidth.$(OBJEXT) url.$(OBJEXT) \
-	ascii.$(OBJEXT) mutt_idna.$(OBJEXT) sidebar.$(OBJEXT)
-mutt_OBJECTS = $(am_mutt_OBJECTS)
-mutt_LDFLAGS =
 am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT)
 mutt_dotlock_OBJECTS = $(am_mutt_dotlock_OBJECTS)
 mutt_dotlock_LDFLAGS =
+am__objects_1 = patchlist.$(OBJEXT)
+am_muttng_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \
+	attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \
+	buffy.$(OBJEXT) color.$(OBJEXT) compress.$(OBJEXT) \
+	crypt.$(OBJEXT) cryptglue.$(OBJEXT) commands.$(OBJEXT) \
+	complete.$(OBJEXT) compose.$(OBJEXT) copy.$(OBJEXT) \
+	curs_lib.$(OBJEXT) curs_main.$(OBJEXT) date.$(OBJEXT) \
+	edit.$(OBJEXT) enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) \
+	filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \
+	handler.$(OBJEXT) hash.$(OBJEXT) hdrline.$(OBJEXT) \
+	headers.$(OBJEXT) help.$(OBJEXT) hook.$(OBJEXT) \
+	keymap.$(OBJEXT) main.$(OBJEXT) mbox.$(OBJEXT) menu.$(OBJEXT) \
+	mh.$(OBJEXT) mx.$(OBJEXT) pager.$(OBJEXT) parse.$(OBJEXT) \
+	pattern.$(OBJEXT) postpone.$(OBJEXT) query.$(OBJEXT) \
+	recvattach.$(OBJEXT) recvcmd.$(OBJEXT) rfc822.$(OBJEXT) \
+	rfc1524.$(OBJEXT) rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) \
+	score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \
+	signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \
+	system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
+	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
+	editmsg.$(OBJEXT) utf8.$(OBJEXT) mbyte.$(OBJEXT) \
+	wcwidth.$(OBJEXT) url.$(OBJEXT) ascii.$(OBJEXT) \
+	mutt_idna.$(OBJEXT) sidebar.$(OBJEXT) hcache.$(OBJEXT)
+muttng_OBJECTS = $(am_muttng_OBJECTS)
+muttng_LDFLAGS =
 am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) lib.$(OBJEXT) \
 	extlib.$(OBJEXT) sha1.$(OBJEXT) md5c.$(OBJEXT) \
 	pgppacket.$(OBJEXT) ascii.$(OBJEXT)
@@ -320,8 +324,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) \
-	$(mutt_dotlock_SOURCES) $(pgpring_SOURCES)
+DIST_SOURCES = $(makedoc_SOURCES) $(mutt_dotlock_SOURCES) \
+	$(muttng_SOURCES) $(EXTRA_muttng_SOURCES) $(pgpring_SOURCES)
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
 	ps-recursive install-info-recursive uninstall-info-recursive \
@@ -329,12 +333,12 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
 	installdirs-recursive install-recursive uninstall-recursive \
 	check-recursive installcheck-recursive
 DIST_COMMON = README ABOUT-NLS ChangeLog INSTALL Makefile.am \
-	Makefile.in Muttrc.head.in NEWS TODO acconfig.h aclocal.m4 \
+	Makefile.in Muttngrc.head.in NEWS TODO acconfig.h aclocal.m4 \
 	config.guess config.h.in config.sub configure configure.in \
 	depcomp install-sh missing mkinstalldirs muttbug.sh.in regex.c \
 	snprintf.c strcasecmp.c strdup.c
 DIST_SUBDIRS = m4 po intl doc contrib imap
-SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) $(pgpring_SOURCES)
+SOURCES = $(makedoc_SOURCES) $(mutt_dotlock_SOURCES) $(muttng_SOURCES) $(EXTRA_muttng_SOURCES) $(pgpring_SOURCES)
 
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -380,7 +384,7 @@ contrib/Makefile: $(top_builddir)/config.status $(top_srcdir)/contrib/Makefile.i
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 muttbug.sh: $(top_builddir)/config.status muttbug.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-Muttrc.head: $(top_builddir)/config.status Muttrc.head.in
+Muttngrc.head: $(top_builddir)/config.status Muttngrc.head.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 doc/instdoc.sh: $(top_builddir)/config.status $(top_srcdir)/doc/instdoc.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -411,12 +415,12 @@ clean-binPROGRAMS:
 makedoc$(EXEEXT): $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES) 
 	@rm -f makedoc$(EXEEXT)
 	$(LINK) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) $(LIBS)
-mutt$(EXEEXT): $(mutt_OBJECTS) $(mutt_DEPENDENCIES) 
-	@rm -f mutt$(EXEEXT)
-	$(LINK) $(mutt_LDFLAGS) $(mutt_OBJECTS) $(mutt_LDADD) $(LIBS)
 mutt_dotlock$(EXEEXT): $(mutt_dotlock_OBJECTS) $(mutt_dotlock_DEPENDENCIES) 
 	@rm -f mutt_dotlock$(EXEEXT)
 	$(LINK) $(mutt_dotlock_LDFLAGS) $(mutt_dotlock_OBJECTS) $(mutt_dotlock_LDADD) $(LIBS)
+muttng$(EXEEXT): $(muttng_OBJECTS) $(muttng_DEPENDENCIES) 
+	@rm -f muttng$(EXEEXT)
+	$(LINK) $(muttng_LDFLAGS) $(muttng_OBJECTS) $(muttng_LDADD) $(LIBS)
 pgpring$(EXEEXT): $(pgpring_OBJECTS) $(pgpring_DEPENDENCIES) 
 	@rm -f pgpring$(EXEEXT)
 	$(LINK) $(pgpring_LDFLAGS) $(pgpring_OBJECTS) $(pgpring_LDADD) $(LIBS)
@@ -851,14 +855,14 @@ install-exec-local:
 		{ echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
 	fi
 
-install-data-local: Muttrc
+install-data-local: Muttngrc
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
-	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
-		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
-	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
-	 	mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
-	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
-		$(INSTALL) -m 644 $(srcdir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
+	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttngrc ] ; then \
+		mv $(DESTDIR)$(pkgdatadir)/Muttngrc* $(DESTDIR)$(sysconfdir) ; \
+	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttngrc ] ; then \
+	 	mv $(DESTDIR)$(pkgdatadir)/../Muttngrc* $(DESTDIR)$(sysconfdir) ; \
+	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttngrc ] ; then \
+		$(INSTALL) -m 644 $(srcdir)/Muttngrc $(DESTDIR)$(sysconfdir) ; \
 	fi
 	-if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
 		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
@@ -899,12 +903,12 @@ mutt-dist:
 update-doc: stamp-doc-rc
 	(cd doc && $(MAKE) update-doc)
 
-Muttrc: stamp-doc-rc
+Muttngrc: stamp-doc-rc
 
-stamp-doc-rc: $(srcdir)/init.h makedoc Muttrc.head
-	-rm -f Muttrc stamp-doc-rc
+stamp-doc-rc: $(srcdir)/init.h makedoc Muttngrc.head
+	-rm -f Muttngrc stamp-doc-rc
 	$(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
-		$(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - > Muttrc
+		$(srcdir)/init.h | ./makedoc -c | cat Muttngrc.head - > Muttngrc
 	touch stamp-doc-rc
 
 .PHONY: commit pclean check-security commit-real commit-changelog