Build system simplifications.

[apps/madmutt.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 476b0d2..3473f36 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -393,8 +393,6 @@ AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]],
         saved_LIBS="$LIBS"
 
         AC_CHECK_LIB(sasl2, sasl_client_init,,AC_MSG_ERROR([could not find libsasl2]))
-
-        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o"
         MUTTLIBS="$MUTTLIBS -lsasl2"
         LIBS="$saved_LIBS"
         AC_DEFINE(USE_SASL,1,
@@ -412,6 +410,7 @@ AC_ARG_WITH(idn, AC_HELP_STRING([--with-idn], [Use GNU libidn for domain names])
             fi
             CPPFLAGS="$CPPFLAGS $IDN_CFLAGS"
             LDFLAGS="$LDFLAGS $IDN_LIBS"
+            AC_DEFINE(HAVE_LIBIDN, 1, [IDN Support])
         ],[AC_MSG_ERROR([could not find libidn])])
     fi
 ])
@@ -548,7 +547,6 @@ fi])
 dnl -- end cache --
 
 AC_SUBST(MUTTLIBS)
-AC_SUBST(MUTT_LIB_OBJECTS)
 AC_SUBST(LIBNNTP)
 AC_SUBST(LIBNNTPDEPS)
 
@@ -641,7 +639,6 @@ if test x$use_libesmtp = xyes; then
     CFLAGS="$CFLAGS $mutt_libesmtp_cflags"
     dnl HACK MUTTLIBS="$MUTTLIBS $mutt_libesmtp_libs"
     MUTTLIBS="$MUTTLIBS -lesmtp"
-    MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_libesmtp.o"
     AC_DEFINE(USE_LIBESMTP, 1, [Define to enable the use of libesmtp])
 fi
 dnl -- end libesmtp --
@@ -737,7 +734,6 @@ AC_OUTPUT(Makefile
           m4/Makefile
           po/Makefile.in
           apidoc/Makefile apidoc/doxygen.cfg
-          doc/Makefile doc/instdoc.sh
           lib-lib/Makefile
           lib-lua/Makefile
           lib-mime/Makefile