deal with version file and BIND_VERSION differently.

configure

@@ -3819,8 +3819,10 @@ BIND9_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes
 
 BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 
+. $srcdir/version
+
+BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}"
 
-BIND9_VERSION=$srcdir/version
 
 
 LIBISC_API=$srcdir/lib/isc/api
@@ -4105,8 +4107,7 @@ s%@BIND9_LWRES_BUILDINCLUDE@%$BIND9_LWRES_BUILDINCLUDE%g
 s%@BIND9_INCLUDES@%%g
 /@BIND9_MAKE_RULES@/r $BIND9_MAKE_RULES
 s%@BIND9_MAKE_RULES@%%g
-/@BIND9_VERSION@/r $BIND9_VERSION
-s%@BIND9_VERSION@%%g
+s%@BIND9_VERSION@%$BIND9_VERSION%g
 /@LIBISC_API@/r $LIBISC_API
 s%@LIBISC_API@%%g
 /@LIBDNS_API@/r $LIBDNS_API

configure.in

@@ -13,7 +13,7 @@ dnl PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 dnl ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 dnl SOFTWARE.
 
-AC_REVISION($Revision: 1.120 $)
+AC_REVISION($Revision: 1.121 $)
 
 AC_PREREQ(2.13)
 
@@ -800,8 +800,9 @@ BIND9_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes
 AC_SUBST_FILE(BIND9_MAKE_RULES)
 BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 
-AC_SUBST_FILE(BIND9_VERSION)
-BIND9_VERSION=$srcdir/version
+. $srcdir/version
+BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}"
+AC_SUBST(BIND9_VERSION)
 
 AC_SUBST_FILE(LIBISC_API)
 LIBISC_API=$srcdir/lib/isc/api

version

-MAJORVER =	9
-MINORVER =	0
-PATCHVER =	0
-RELEASETYPE =	b
-RELEASEVER =	3
-
-VERSION =	${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}
+# $Id: version,v 1.13 2000/04/27 23:47:49 explorer Exp $
+#
+# This file must follow /bin/sh rules.  It is imported directly via
+# configure.
+#
+MAJORVER=9
+MINORVER=0
+PATCHVER=0
+RELEASETYPE=b
+RELEASEVER=3