X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=2f71dfdb0a077f15448827cc344486f848f1b540;hp=f50037529a796bc88a385c66bf5b77d45d2e24cf;hb=05bcba73c3b028d4c571b5cf754bfd4436e1f11c;hpb=766fd6928123218aca635827248299ceeeb1d170

diff --git a/configure.ac b/configure.ac
index f500375..2f71dfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,13 +9,11 @@ AM_CONFIG_HEADER(config.h)
 
 mutt_cv_version=`cat "$srcdir/VERSION.in"`
 
-AM_INIT_AUTOMAKE(muttng, $mutt_cv_version)
+AM_INIT_AUTOMAKE(madmutt, $mutt_cv_version)
 AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in'])
 
 AC_GNU_SOURCE
 
-ifdef([AC_LIBOBJ], , [define([AC_LIBOBJ], [LIB[]OBJS="$LIBOBJS $1.o"])])
-
 ALL_LINGUAS="de ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv da lt tr ja hu et ca bg"
 
 AC_CANONICAL_HOST
@@ -38,6 +36,8 @@ AC_PROG_CPP
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_RANLIB
+AC_PROG_GPERF
+PKG_PROG_PKG_CONFIG
 AC_CHECK_TOOL(AR, ar, ar)
 
 AC_C_INLINE
@@ -105,27 +105,12 @@ dnl ---------------- gpgme ----------------
             have_gpgme=yes
         fi
     ])
-    AC_ARG_WITH(gpgme-prefix, AC_HELP_STRING([--with-gpgme-prefix=PFX], [prefix where GPGME is installed (optional)]),
-    gpgme_config_prefix="$withval", gpgme_config_prefix="")
-
     if test x$have_gpgme = xyes; then
-        if test x$gpgme_config_prefix != x; then
-            GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config"
-        else
-            AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
-        fi
-        if test "x$GPGME_CONFIG" = "xno"; then
-            AC_MSG_ERROR([GPGME not found])
-        else
-            LIBGPGME_CFLAGS=`$GPGME_CONFIG --cflags`
-            LIBGPGME_LIBS=`$GPGME_CONFIG --libs`
-            MUTTLIBS="$MUTTLIBS $LIBGPGME_LIBS"
-            MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS crypt-gpgme.o crypt-mod-pgp-gpgme.o crypt-mod-smime-gpgme.o"
-            AC_DEFINE(CRYPT_BACKEND_GPGME, 1, [Defined, if GPGME support is enabled])
-        fi
+        AM_PATH_GPGME(,,[AC_MSG_ERROR(GPGME not found)])
+        MUTTLIBS="$MUTTLIBS $GPGME_LIBS"
+        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS crypt-gpgme.o crypt-mod-pgp-gpgme.o crypt-mod-smime-gpgme.o"
+        AC_DEFINE(CRYPT_BACKEND_GPGME, 1, [Defined, if GPGME support is enabled])
     fi
-    AC_SUBST(LIBGPGME_CFLAGS)
-    AC_SUBST(LIBGPGME_LIBS)
 
 dnl ---------------- mixmaster ----------------
 
@@ -288,7 +273,6 @@ fi
 AC_DECL_SYS_SIGLIST
 
 AC_TYPE_PID_T
-dnl AC_CHECK_TYPE(ssize_t, int)
 
 AC_CHECK_FUNCS(fgetpos memmove setegid srand48 strerror)
 AC_REPLACE_FUNCS(strcasecmp setenv)
@@ -299,15 +283,6 @@ if test $ac_cv_func_getopt = yes; then
     AC_CHECK_HEADERS(getopt.h)
 fi
 
-dnl SCO uses chsize() instead of ftruncate()
-AC_CHECK_FUNCS(ftruncate, , [AC_CHECK_LIB(x, chsize)])
-
-dnl SCO has strftime() in libintl
-AC_CHECK_FUNCS(strftime, , [AC_CHECK_LIB(intl, strftime)])
-
-dnl AIX may not have fchdir()
-AC_CHECK_FUNCS(fchdir, , [mutt_cv_fchdir=no])
-
 AC_ARG_WITH(regex, AC_HELP_STRING([--with-regex], [Use the GNU regex library]),
         [mutt_cv_regex=yes],
         [AC_CHECK_FUNCS(regcomp, mutt_cv_regex=no, mutt_cv_regex=yes)])
@@ -328,7 +303,7 @@ fi
 
 if test $mutt_cv_regex = yes; then
     AC_DEFINE(USE_GNU_REGEX,1,[ Define if you want to use the included regex.c. ])
-    AC_LIBOBJ(regex)
+    LIBOBJS="$LIBOBJS regex.o"
 fi
 
 
@@ -409,7 +384,7 @@ fi
 AC_MSG_CHECKING(where to put the documentation)
 AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=PATH], [Specify where to put the documentation]),
         [mutt_cv_docdir=$withval],
-        [mutt_cv_docdir="${prefix}/doc/muttng"])
+        [mutt_cv_docdir="${prefix}/doc/madmutt"])
 AC_MSG_RESULT($mutt_cv_docdir)
 
 docdir=$mutt_cv_docdir
@@ -425,60 +400,27 @@ fi
 AC_SUBST(DOTLOCK_GROUP)
 AC_SUBST(DOTLOCK_PERMISSION)
 
-need_socket="no"
-
 dnl -- socket dependencies --
 
-AC_ARG_ENABLE(pop,  AC_HELP_STRING([--enable-pop], [Enable POP3 support]),
-[   if test x$enableval = xyes ; then
-        AC_DEFINE(USE_POP,1,[ Define if you want support for the POP3 protocol. ])
-        LIBPOP="-Lpop -lpop"
-        LIBPOPDEPS="\$(top_srcdir)/pop/pop.h pop/libpop.a"
-        need_socket="yes"
-        need_pop="yes"
-        need_md5="yes"
-    fi
-])
-AM_CONDITIONAL(BUILD_POP, test x$need_pop = xyes)
-
-AC_ARG_ENABLE(imap, AC_HELP_STRING([--enable-imap], [Enable IMAP support]),
-[   if test x$enableval = xyes ; then
-        AC_DEFINE(USE_IMAP,1,[ Define if you want support for the IMAP protocol. ])
-        LIBIMAP="-Limap -limap"
-        LIBIMAPDEPS="\$(top_srcdir)/imap/imap.h imap/libimap.a"
-        need_imap="yes"
-        need_socket="yes"
-        need_md5="yes"
-    fi
-])
-AM_CONDITIONAL(BUILD_IMAP, test x$need_imap = xyes)
-
 AC_ARG_ENABLE(nntp, [  --enable-nntp              Enable NNTP support],
 [   if test x$enableval = xyes ; then
         AC_DEFINE(USE_NNTP,1,[ Compiling with newsreading support with NNTP ])
         LIBNNTP="-Lnntp -lnntp"
         LIBNNTPDEPS="\$(top_srcdir)/nntp/nntp.h nntp/libnntp.a"
         need_nntp="yes"
-        need_socket="yes"
     fi
 ])
 AM_CONDITIONAL(BUILD_NNTP, test x$need_nntp = xyes)
 
 dnl -- end socket dependencies --
 
-if test "$need_socket" = "yes"
-then
-    AC_MSG_CHECKING([for socklen_t])
-    AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]),
-            AC_MSG_RESULT([no])
-            AC_DEFINE(socklen_t,int, [ Define to 'int' if <sys/socket.h> doesn't have it. ]))
-    AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
-    AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
-    AC_CHECK_FUNCS(getaddrinfo)
-    AC_DEFINE(USE_SOCKET,1,
-            [ Include code for socket support. Set automatically if you enable POP3 or IMAP ])
-    MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS account.o mutt_socket.o mutt_tunnel.o"
-fi
+AC_MSG_CHECKING([for socklen_t])
+AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]),
+        AC_MSG_RESULT([no])
+        AC_DEFINE(socklen_t,int, [ Define to 'int' if <sys/socket.h> doesn't have it. ]))
+AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
+AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
+AC_CHECK_FUNCS(getaddrinfo)
 
 dnl -- imap dependencies --
 
@@ -486,8 +428,6 @@ AC_ARG_WITH(gss, AC_HELP_STRING([--with-gss[=PFX]], [Compile in GSSAPI authentic
     gss_prefix="$withval", gss_prefix="no")
 if test "$gss_prefix" != "no"
 then
-  if test "$need_imap" = "yes"
-  then
     MUTT_AM_PATH_GSSAPI(gss_prefix)
     AC_MSG_CHECKING(GSSAPI implementation)
     AC_MSG_RESULT($GSSAPI_IMPL)
@@ -504,9 +444,6 @@ then
     MUTTLIBS="$MUTTLIBS $GSSAPI_LIBS"
     AC_DEFINE(USE_GSS,1,[ Define if you have GSSAPI libraries available ])
     need_gss="yes"
-  else
-    AC_MSG_WARN([GSS was requested but IMAP is not enabled])
-  fi
 fi
 AM_CONDITIONAL(USE_GSS, test x$need_gss = xyes)
 
@@ -515,10 +452,6 @@ dnl -- end imap dependencies --
 AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for POP/IMAP]),
 [       if test "$with_ssl" != "no"
         then
-          if test "$need_socket" != "yes"; then
-           AC_MSG_ERROR([SSL support is only useful with POP or IMAP support])
-          fi
-
           if test "$with_ssl" != "yes"
           then
            LDFLAGS="$LDFLAGS -L$withval/lib"
@@ -544,10 +477,6 @@ AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Enable SSL support
     [gnutls_prefix="$withval"], [gnutls_prefix="no"])
 if test "$gnutls_prefix" != "no"
 then
-  if test "$need_socket" != "yes"
-  then
-    AC_MSG_ERROR([SSL support is only useful with POP or IMAP support])
-  fi
   if test x"$need_ssl" = x"yes"
   then
     AC_MSG_ERROR([Only either OpenSSL or GNUTLS may be used])
@@ -567,13 +496,9 @@ fi
 
 AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
 
-AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]], [Use Cyrus SASL library version 2 for POP/IMAP authentication]),
+AC_ARG_WITH(sasl2, AC_HELP_STRING([--with-sasl2[=PFX]],
+            [Use Cyrus SASL library version 2 for POP/IMAP authentication]),
         [
-        if test "$with_sasl2" != "no" -a "$need_imap" != "yes" -a "$need_pop" != "yes"
-        then
-          AC_MSG_ERROR([SASL2 support is only useful with POP or IMAP support])
-        fi
-
         if test "$with_sasl2" != "no"
         then
           if test "$with_sasl2" != "yes"
@@ -664,29 +589,13 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
     AC_ARG_WITH(qdbm, AC_HELP_STRING([--without-qdbm], [Don't use qdbm even if it is available]),
         ac_prefer_qdbm=$withval)
     if test x$ac_prefer_qdbm != xno; then
-        ac_cv_vlopen=no
-        QDBM_DIRS="$mutt_cv_prefix /usr/local /usr"
-        AC_MSG_CHECKING([for vlopen])
-        for d in $QDBM_DIRS; do
-          if test x$ac_cv_vlopen = xno && test -d "$d/include" && test -d "$d/lib"; then
-            QDBM_INC="-I$d/include"
-            QDBM_LIB="-L$d/lib"
-            CPPFLAGS="$OLDCPPFLAGS $QDBM_INC"
-            LIBS="$OLDLIBS $QDBM_LIB -lqdbm"
-            AC_TRY_LINK([#include <villa.h>],[vlopen(0,0,0);],[ac_cv_vlopen=yes])
-          fi
-        done
-        if test x$ac_cv_vlopen = xyes; then
-          AC_MSG_RESULT(yes)
-        else
-          AC_MSG_RESULT(no)
-        fi
+        PKG_CHECK_MODULES(QDBM,qdbm,[ac_qdbm_here=yes],[ac_qdbm_here=no])
     fi
 
     ac_prefer_gdbm=yes
     AC_ARG_WITH(gdbm, AC_HELP_STRING([--without-gdbm], [Don't use gdbm even if it is available]),
         ac_prefer_gdbm=$withval)
-    if test x$ac_prefer_gdbm != xno -a x$ac_cv_vlopen != xyes; then
+    if test x$ac_prefer_gdbm != xno -a x$ac_qdbm_here != xyes; then
         ac_cv_gdbmopen=no
         GDBM_DIRS="$mutt_cv_prefix /usr/local /usr"
         AC_MSG_CHECKING([for gdbm_open])
@@ -705,11 +614,11 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
           AC_MSG_RESULT(no)
         fi
     fi
-   
+
     ac_bdb_prefix=yes
     AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]], [Use BerkeleyDB4 if gdbm is not available ]),
         ac_bdb_prefix=$withval)
-    if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then
+    if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_qdbm_here != xyes; then
         test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"
         for d in $ac_bdb_prefix; do
             bdbpfx="$bdbpfx $d"
@@ -755,9 +664,9 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
         fi
     fi
 
-    if test x$ac_cv_vlopen = xyes; then
-        CPPFLAGS="$OLDCPPFLAGS $QDBM_INC"
-        LIBS="$OLDLIBS $QDBM_LIB -lqdbm"
+    if test x$ac_qdbm_here = xyes; then
+        CPPFLAGS="$OLDCPPFLAGS $QDBM_CFLAGS"
+        LIBS="$OLDLIBS $QDBM_LIBS"
         AC_DEFINE(HAVE_QDBM, 1, [QDBM Support])
     elif test x$ac_cv_gdbmopen = xyes; then
         CPPFLAGS="$OLDCPPFLAGS $GDBM_INC"
@@ -775,10 +684,6 @@ dnl -- end cache --
 
 AC_SUBST(MUTTLIBS)
 AC_SUBST(MUTT_LIB_OBJECTS)
-AC_SUBST(LIBIMAP)
-AC_SUBST(LIBIMAPDEPS)
-AC_SUBST(LIBPOP)
-AC_SUBST(LIBPOPDEPS)
 AC_SUBST(LIBNNTP)
 AC_SUBST(LIBNNTPDEPS)
 
@@ -1065,10 +970,11 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile
         muttbug.sh
         lib-lib/Makefile
         lib-mime/Makefile
+        lib-crypt/Makefile
         lib-hash/Makefile
         lib/Makefile
         imap/Makefile
         pop/Makefile
         nntp/Makefile
-        Muttngrc.head
+        Madmuttrc.head
         doc/instdoc.sh)