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

diff --git a/configure.in b/configure.in
index 08240d7..2215e55 100644
--- a/configure.in
+++ b/configure.in
@@ -7,15 +7,11 @@ AC_PREREQ([2.50])
 AC_INIT([mutt.h])
 AM_CONFIG_HEADER(config.h)
 
-if test -f "$srcdir/.svn/entries" ; then
-  echo "`cat $srcdir/VERSION.in`-r`grep revision $srcdir/.svn/entries | sort -r | uniq | head -n 1 | cut -d '"' -f 2`" > "$srcdir/VERSION"
-else
-  cp "$srcdir/VERSION.in" "$srcdir/VERSION"
-fi
-
-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"])])
@@ -263,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"])
@@ -1142,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))