X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.in;h=73fb92215de336352e697304343b88f463781313;hp=68aadba9f246a479c9ab91fc85a1530cac34fd9e;hb=ce5e12405904f419adf8b4b6d4465fb27274c08b;hpb=f997801a16ce4a8530cb30cddebfe6243cb3502d

diff --git a/configure.in b/configure.in
index 68aadba..73fb922 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,13 @@ AC_PREREQ([2.50])
 AC_INIT([mutt.h])
 AM_CONFIG_HEADER(config.h)
 
-mutt_cv_version=`cat $srcdir/VERSION`
+if test -f "$srcdir./.svn/entries" ; then
+  echo "`cat $srcdir/VERSION.in`-r`grep revision $srcdir/.svn/entries | cut -d '"' -f 2`" > "$srcdir/VERSION"
+else
+  cp "$srcdir/VERSION.in" "$srcdir/VERSION"
+fi
+
+mutt_cv_version=`cat "$srcdir/VERSION"`
 
 AM_INIT_AUTOMAKE(muttng, $mutt_cv_version)
 dnl AC_GNU_SOURCE
@@ -90,10 +96,6 @@ AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$ac_aux_path_sendmail
 AC_DEFINE_UNQUOTED(SENDMAIL,"$ac_cv_path_SENDMAIL",[ Where to find sendmail on your system. ])
 
 OPS='$(srcdir)/OPS'
-if test -f $srcdir/EXPORTABLE ; then
-        SUBVERSION="us"
-else
-        SUBVERSION="i"
 
 	AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),
 	[       if test x$enableval = xyes; then
@@ -161,7 +163,6 @@ else
                          [ Where to find mixmaster on your system. ])
                 ])
 
-fi
 # We now require all OPS
 OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT "
 AC_SUBST([OPS])
@@ -170,9 +171,6 @@ AC_SUBST([OPS])
 AC_SUBST(PGPAUX_TARGET)
 AC_SUBST(SMIMEAUX_TARGET)
 
-AC_DEFINE_UNQUOTED(SUBVERSION,"$SUBVERSION",[ Is this the international version? ])
-AC_SUBST([SUBVERSION])
-
 AC_PATH_PROG(ISPELL, ispell, no)
 if test $ISPELL != no; then
         AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[ Where to find ispell on your system. ])
@@ -254,7 +252,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
@@ -900,7 +898,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
                                 break
                             ])
                         done
-                        test x$ac_dbcreate = xyes && break
+                        test x$ac_cv_dbcreate = xyes && break
                     fi
                 fi
             done
@@ -926,7 +924,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 --