git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@82 e385b8ad-14ed-0310-8656-cc95a2468c6d

[apps/madmutt.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 023063e..e9f533e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,6 +88,7 @@ GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GPGME_CONFIG = @GPGME_CONFIG@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -100,6 +101,11 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 ISPELL = @ISPELL@
 KRB5CFGPATH = @KRB5CFGPATH@
 LDFLAGS = @LDFLAGS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBGPGME_CFLAGS = @LIBGPGME_CFLAGS@
+LIBGPGME_LIBS = @LIBGPGME_LIBS@
 LIBICONV = @LIBICONV@
 LIBIMAP = @LIBIMAP@
 LIBIMAPDEPS = @LIBIMAPDEPS@
@@ -133,8 +139,6 @@ 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@
@@ -224,7 +228,7 @@ makedoc_SOURCES = makedoc.c
 makedoc_LDADD = 
 makedoc_DEPENDENCIES = 
 
-INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
+INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
 
 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 \
@@ -249,7 +253,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        makedoc.c stamp-doc-rc README.SSL smime.h\
        muttngbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh       \
        ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
-       snprintf.c regex.c mutt_libesmtp.h
+       snprintf.c regex.c mutt_libesmtp.h crypt-gpgme.h
 
 
 muttng_dotlock_SOURCES = mutt_dotlock.c
@@ -360,7 +364,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.in m4/codeset.m4 m4/curslib.m4 m4/funcdecl.m4 m4/gettext.m4 m4/glibc21.m4 m4/gssapi.m4 m4/iconv.m4 m4/lcmessage.m4 m4/libesmtp.m4 m4/progtest.m4
+$(ACLOCAL_M4):  configure.in m4/codeset.m4 m4/curslib.m4 m4/funcdecl.m4 m4/gettext.m4 m4/glibc21.m4 m4/gssapi.m4 m4/iconv.m4 m4/lcmessage.m4 m4/libesmtp.m4 m4/libgnutls.m4 m4/progtest.m4 m4/types.m4
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.h: stamp-h1