X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.in;h=2215e55d393f24c22ff1bdcf2092df61038e8fd6;hp=49ddc6d16ed0b311905795f3cedd969ec08a721d;hb=955b6b84c6eabd42a96ff0176003ef72d49d9c38;hpb=03ecb7c70bd09a8302212ed3e7f94f9a7b14d099

diff --git a/configure.in b/configure.in
index 49ddc6d..2215e55 100644
--- a/configure.in
+++ b/configure.in
@@ -7,9 +7,11 @@ AC_PREREQ([2.50])
 AC_INIT([mutt.h])
 AM_CONFIG_HEADER(config.h)
 
-mutt_cv_version=`cat $srcdir/VERSION`
+mutt_cv_version=`cat "$srcdir/VERSION.in"`
 
 AM_INIT_AUTOMAKE(muttng, $mutt_cv_version)
+AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in'])
+
 dnl AC_GNU_SOURCE
 
 ifdef([AC_LIBOBJ], , [define([AC_LIBOBJ], [LIB[]OBJS="$LIBOBJS $1.o"])])
@@ -246,7 +248,7 @@ main ()
 
 	AC_CHECK_FUNC(initscr,,[
 	cf_ncurses="ncurses"
-	for lib in ncurses ncursesw
+	for lib in ncursesw ncurses
 	do
 		AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break])
 	done
@@ -257,6 +259,7 @@ main ()
                 fi
 		
                 if test "$cf_ncurses" = ncursesw; then
+			AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"])
 			AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"])
 		else
 			AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"])
@@ -459,7 +462,7 @@ AC_SUBST(DOTLOCK_TARGET)
 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="$mutt_cv_prefix/doc/muttng"])
+        [mutt_cv_docdir="${prefix}/doc/muttng"])
 AC_MSG_RESULT($mutt_cv_docdir)
 
 docdir=$mutt_cv_docdir
@@ -595,31 +598,6 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for
 
         fi
 ])
-AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
-
-dnl SSL support via NSS
-AC_ARG_WITH(nss, AC_HELP_STRING([--with-nss[=PFX]], [Compile in SSL support for POP/IMAP via NSS]),
-[       if test "$with_nss" != 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_nss" != "yes"
-          then
-           LDFLAGS="$LDFLAGS -L$withval/lib"
-           CPPFLAGS="$CPPFLAGS -I$withval/include -I$withval/public/security"
-          fi
-
-          AC_DEFINE(USE_NSS,1,[ Define if you want support for SSL via the NSS library. ])
-          MUTTLIBS="$MUTTLIBS -lssl -lnss -lcertdb -lcerthi -lcryptohi"
-          MUTTLIBS="$MUTTLIBS -lpk11wrap -lsoftoken -lsecutil -ldbm -lplds4 -lplc4 -lfreebl"
-          MUTTLIBS="$MUTTLIBS -lnspr4"
-
-          MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_nss.o"
-          need_ssl=yes
-        fi
-])
 
 AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Enable SSL support using gnutls]),
     [gnutls_prefix="$withval"], [gnutls_prefix="no"])
@@ -642,6 +620,8 @@ then
     ])
 fi
 
+AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
+
 AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL library for POP/IMAP authentication]),
         [
         if test "$with_sasl" != "no" -a "$need_imap" != "yes" -a "$need_pop" != "yes"
@@ -918,7 +898,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
         LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB"
         AC_DEFINE(HAVE_DB4, 1, [Sleepycat DB4 Support])
     else
-        AC_MSG_ERROR(You need QDBM, GDBM or Sleepycat DB4 for --enable-hcache)
+        AC_MSG_ERROR([You need one of: QDBM, GDBM or Sleepycat DB4 for --enable-hcache])
     fi
 fi])
 dnl -- end cache --
@@ -1159,13 +1139,13 @@ case "`uname -s`" in
     AC_MSG_RESULT(FreeBSD)
     ;;
   SunOS)
-    SGML2TXT_CMD="sgml2txt manual || true"
-    SGML2PS_CMD="sgml2latex -p manual || true"
-    SGML2HTML_CMD="sgml2html manual || true"
+    SGML2TXT_CMD="sgml2txt -l manual || true"
+    SGML2PS_CMD="sgml2latex -l -p manual || true"
+    SGML2HTML_CMD="sgml2html -l manual || true"
     AC_MSG_RESULT(Solaris)
     ;;
   *)
-    SGML2TXT_CMD="if linuxdoc -B txt --pass='-P -c' manual ; then uniq < manual.txt | expand > _manual.txt ; rm manual.txt ; col -b < _manual.txt > manual.txt ; rm -rf _manual.txt ; fi || true"
+    SGML2TXT_CMD="if linuxdoc -B txt -c latin --pass='-P -c' manual ; then uniq < manual.txt | expand > _manual.txt ; rm manual.txt ; col -b < _manual.txt > manual.txt ; rm -rf _manual.txt ; fi || true"
     SGML2PS_CMD="sgml2latex --output=ps manual || true"
     SGML2HTML_CMD="sgml2html manual || true"
     AC_MSG_RESULT(Linux (default))