From: Brendan Cully <brendan@kublai.com>
Date: Wed, 7 Sep 2005 00:22:09 +0000 (+0000)
Subject: Remove international vs. U.S. distribution distinction. build-release
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cf495bcdec6ab354df8dbeaa06c42bdf350948e;p=neomutt

Remove international vs. U.S. distribution distinction. build-release
expects the previous version to be x.y.zi and should be updated again
for 1.5.12.
---

diff --git a/build-release b/build-release
index ce779a035..a1800e4b2 100755
--- a/build-release
+++ b/build-release
@@ -60,10 +60,7 @@ make changelog
 
 # build them
 
-# make us-dist
 make dist
-mv mutt-${VERSION}.tar.gz mutt-${VERSION}i.tar.gz
-# mv mutt-${VERSION}-us.tar.gz mutt-${VERSION}.tar.gz
 
 # commit and tag the release
 
@@ -75,16 +72,16 @@ cvs tag ${TAG}
 
 if test "$diff" = yes ; then
 	cvs rdiff -u -r ${OTAG} -r ${TAG} mutt | gzip -9 \
-		> diff-${OVERSION}i-${VERSION}i.gz
+		> diff-${OVERSION}i-${VERSION}.gz
 fi
 
 # sign the various files
 
 # DISTFILES="mutt-${VERSION}.tar.gz mutt-${VERSION}i.tar.gz diff-${OVERSION}i-${VERSION}i.gz"
-DISTFILES="mutt-${VERSION}i.tar.gz"
+DISTFILES="mutt-${VERSION}.tar.gz"
 
 if test "$diff" = yes ; then
-	DISTFILES="$DISTFILES diff-${OVERSION}i-${VERSION}i.gz"
+	DISTFILES="$DISTFILES diff-${OVERSION}i-${VERSION}.gz"
 fi
 
 for f in $DISTFILES; do
diff --git a/configure.in b/configure.in
index e23c5347c..4007b038d 100644
--- a/configure.in
+++ b/configure.in
@@ -86,91 +86,78 @@ MUTT_C99_INTTYPES
 
 ac_aux_path_sendmail=/usr/sbin:/usr/lib
 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. ])
+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
-			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`
-			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_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]),
+[       if test x$enableval = xyes; then
+		have_gpgme=yes
 	fi
-	AC_SUBST(LIBGPGME_CFLAGS)
-	AC_SUBST(LIBGPGME_LIBS)
-
-        AC_ARG_ENABLE(pgp, AC_HELP_STRING([--disable-pgp], [Disable PGP support]),
-        [       if test x$enableval = xno ; then
-                        have_pgp=no
-                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`
+		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
+fi
+AC_SUBST(LIBGPGME_CFLAGS)
+AC_SUBST(LIBGPGME_LIBS)
 
-        if test x$have_pgp != xno ; then
-                AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1,
-                    [ Define if you want classic PGP support. ])
-                PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)"
-                MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o"
+AC_ARG_ENABLE(pgp, AC_HELP_STRING([--disable-pgp], [Disable PGP support]),
+[       if test x$enableval = xno ; then
+                have_pgp=no
         fi
+])
 
- 	AC_ARG_ENABLE(smime, AC_HELP_STRING([--disable-smime], [Disable SMIME support]),
- 	[	if test x$enableval = xno ; then
- 			have_smime=no
- 		fi
- 	])
- 
- 	if test x$have_smime != xno ; then
- 		AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME,1,
-                  [ Define if you want clasic S/MIME support. ])
- 		MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o"
-		SMIMEAUX_TARGET="smime_keys"
- 	fi
-  
-        AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]),
-                [if test -x "$withval" ; then
-                        MIXMASTER="$withval"
-                 else
-                        MIXMASTER="mixmaster"
-                 fi
-                 OPS="$OPS \$(srcdir)/OPS.MIX"
-                 MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS remailer.o"
-                 AC_DEFINE_UNQUOTED(MIXMASTER,"$MIXMASTER",
-                         [ Where to find mixmaster on your system. ])
-                ])
+if test x$have_pgp != xno ; then
+        AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1, [Define if you want classic PGP support.])
+        PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)"
+        MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o"
+fi
 
+AC_ARG_ENABLE(smime, AC_HELP_STRING([--disable-smime], [Disable SMIME support]),
+[	if test x$enableval = xno ; then
+		have_smime=no
+	fi
+])
+ 
+if test x$have_smime != xno ; then
+	AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME, 1, [Define if you want clasic S/MIME support.])
+	MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o"
+	SMIMEAUX_TARGET="smime_keys"
 fi
+
+AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]),
+        [if test -x "$withval" ; then
+                MIXMASTER="$withval"
+         else
+                MIXMASTER="mixmaster"
+         fi
+         OPS="$OPS \$(srcdir)/OPS.MIX"
+         MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS remailer.o"
+         AC_DEFINE_UNQUOTED(MIXMASTER,"$MIXMASTER", [Where to find mixmaster on your system.])
+        ])
+
 # We now require all OPS
 OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT "
 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. ])
diff --git a/mutt.h b/mutt.h
index 2dd0eb0b5..f7535a616 100644
--- a/mutt.h
+++ b/mutt.h
@@ -60,11 +60,7 @@
 # define MB_LEN_MAX 16
 #endif
 
-#ifdef SUBVERSION
-# define MUTT_VERSION (VERSION SUBVERSION)
-#else  
-# define MUTT_VERSION (VERSION)
-#endif
+#define MUTT_VERSION (VERSION)
 
 /* nifty trick I stole from ELM 2.5alpha. */
 #ifdef MAIN_C