X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.ac;h=4ffd08df62a70f454953ce9ea0c70a74417c25da;hp=2c54741ac9c4817d4a5eb21b30b931a125a8c746;hb=6b8e3f7a8d030a75121a72ba89ae8063439aaa6c;hpb=fb0de7e2db97b1fe0882a31135b2fe4c1bae1821

diff --git a/configure.ac b/configure.ac
index 2c54741..4ffd08d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ PKG_PROG_PKG_CONFIG
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-AC_PROG_GPERF
+AC_PATH_PROG(GPERF, gperf, AC_MSG_ERROR([Could not find gperf]))
 AC_CHECK_TOOL(AR, ar, ar)
 
 AC_SYS_LARGEFILE
@@ -50,9 +50,6 @@ AH_TEMPLATE([SIG_ATOMIC_VOLATILE_T],
             [Some systems declare sig_atomic_t as volatile, some others -- no.
              This define will have value `sig_atomic_t' or
              `volatile sig_atomic_t' accordingly.])
-AH_TEMPLATE([ICONV_NONTRANS],
-            [Define as 1 if iconv() only converts exactly and we should treat
-             all return values other than (size_t)(-1) as equivalent.])
 
 dnl ---------------- sendmail ----------------
 
@@ -325,9 +322,9 @@ 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_CHECK_FUNC(gethostent,,AC_CHECK_LIB(nsl, gethostent))
+AC_CHECK_FUNC(setsockopt,,AC_CHECK_LIB(socket, setsockopt))
+AC_CHECK_FUNC(getaddrinfo,,[AC_MSG_ERROR([cannot find getaddrinfo])])
 
 dnl -- imap dependencies --
 
@@ -465,7 +462,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
 
     if test x$ac_qdbm_here = xyes; then
         CPPFLAGS="$OLDCPPFLAGS $QDBM_CFLAGS"
-        MUTTLIBS="$MUTTLIBS $QDBM_LIBS"
+        MUTTLIBS="$MUTTLIBS -lqdbm"
         AC_DEFINE(HAVE_QDBM, 1, [QDBM Support])
     elif test x$ac_cv_gdbmopen = xyes; then
         CPPFLAGS="$OLDCPPFLAGS $GDBM_INC"
@@ -572,94 +569,34 @@ dnl -- libesmtp --
 MUTT_AM_LIBESMTP
 if test x$use_libesmtp = xyes; then
     CFLAGS="$CFLAGS $mutt_libesmtp_cflags"
-    dnl HACK MUTTLIBS="$MUTTLIBS $mutt_libesmtp_libs"
     MUTTLIBS="$MUTTLIBS -lesmtp"
     AC_DEFINE(USE_LIBESMTP, 1, [Define to enable the use of libesmtp])
 fi
 dnl -- end libesmtp --
 
-dnl -- sgml tools --
-
-dnl Documentation tools
-have_openjade="no"
-AC_PATH_PROG([OSPCAT], [ospcat], [none])
-if test "x$OSPCAT" != "xnone"; then
-    AC_MSG_CHECKING([for openjade docbook stylesheets])
-    dslosfile=`ospcat --public-id="-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN"`
-    DSLROOT=`echo $dslosfile | sed -n -e "s/.*SOIBASE='\(@<:@^'@:>@*\)\/catalog'.*/\1/p"`
-    # ospcat may spit out an absolute path without an SOIBASE
-    if test -z "$DSLROOT"; then
-        DSLROOT=`echo $dslosfile | sed -e 's|<OSFILE>\(.*\)/print/docbook.dsl|\1|'`
-    fi
-    if test -f $DSLROOT/print/docbook.dsl; then
-        AC_MSG_RESULT([in $DSLROOT])
-        have_openjade="yes"
-    else
-        AC_MSG_RESULT([not found: PDF documentation will not be built.])
-    fi
-fi
-AC_SUBST(DSLROOT)
-
-AC_MSG_CHECKING([for lynx])
-AC_PATH_PROG([HTML2TXT_CMD], [lynx], [none])
-if test x"$HTML2TXT_CMD" = x"none"; then
-    AC_MSG_CHECKING([for w3m])
-    AC_PATH_PROG([HTML2TXT_CMD], [w3m], [none])
-fi
-if test x"$HTML2TXT_CMD" = x"none"; then
-    AC_MSG_CHECKING([for elinks])
-    AC_PATH_PROG([HTML2TXT_CMD], [elinks], [none])
-fi
-case "$HTML2TXT_CMD" in
-  *elinks*)
-    HTML2TXT_CMD="$HTML2TXT_CMD -dump -no-numbering -no-references \$^ > \$@"
-    ;;
-  *lynx*)
-    HTML2TXT_CMD="$HTML2TXT_CMD -dump -nolist -with_backspaces \$^ > \$@"
-    ;;
-  *w3m*)
-    HTML2TXT_CMD="$HTML2TXT_CMD -dump \$^ > \$@"
-    ;;
-  *)
-    HTML2TXT_CMD="true"
-    ;;
-esac
-AC_SUBST(HTML2TXT_CMD)
-
-AC_MSG_CHECKING([for tidy])
-AC_PATH_PROG([HTMLCLEAN_CMD], [tidy], [none])
-
-if test x"$HTMLCLEAN_CMD" != x"none"; then
-    HTMLCLEAN_CMD="$HTMLCLEAN_CMD -q -i -m -asxml -utf8 "
-else
-    HTMLCLEAN_CMD="echo "
-fi
-AC_SUBST(HTMLCLEAN_CMD)
-
-AC_ARG_ENABLE(doc,
-  [  --enable-doc            build documentation (needs doxygen and LaTeX)])
+AC_ARG_ENABLE(doc, [  --enable-doc            build documentation (needs doxygen and LaTeX)])
 # Build documentation?
 DOXYGEN="no"
 LATEX="no"
 if test "${enable_doc}" != "no"; then
-  AC_PATH_PROG(DOXYGEN, doxygen, no)
-  if test "${DOXYGEN}" != "no"; then
-    # Build LaTeX documentation?
-    AC_PATH_PROG(LATEX, pdflatex, no)
-    AC_PATH_PROG(DVIPS, dvips, no)
-    if test "${DVIPS}" = "no"; then
-      LATEX="no"
-    fi
-    AC_MSG_CHECKING(for a4wide.sty)
-    if test -f /usr/share/texmf/tex/latex/misc/a4wide.sty; then
-      AC_MSG_RESULT(yes)
-    elif test -f /usr/share/texmf-tetex/tex/latex/a4wide/a4wide.sty; then
-      AC_MSG_RESULT(yes)
-    else
-      LATEX="no"
-      AC_MSG_RESULT(no)
+    AC_PATH_PROG(DOXYGEN, doxygen, no)
+    if test "${DOXYGEN}" != "no"; then
+        # Build LaTeX documentation?
+        AC_PATH_PROG(LATEX, pdflatex, no)
+        AC_PATH_PROG(DVIPS, dvips, no)
+        if test "${DVIPS}" = "no"; then
+            LATEX="no"
+        fi
+        AC_MSG_CHECKING(for a4wide.sty)
+        if test -f /usr/share/texmf/tex/latex/misc/a4wide.sty; then
+            AC_MSG_RESULT(yes)
+        elif test -f /usr/share/texmf-tetex/tex/latex/a4wide/a4wide.sty; then
+            AC_MSG_RESULT(yes)
+        else
+            LATEX="no"
+            AC_MSG_RESULT(no)
+        fi
     fi
-  fi
 fi
 AM_CONDITIONAL(BUILD_DOCUMENTATION, test "${DOXYGEN}" != "no")
 AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
@@ -672,7 +609,6 @@ AC_OUTPUT(Makefile
           lib-lib/Makefile
           lib-lua/Makefile
           lib-mime/Makefile
-          lib-hash/Makefile
           lib-mx/Makefile
           lib-sys/Makefile
           lib-ui/Makefile