Use build/version.sh instead of build/version

diff --git a/build/version b/build/version
deleted file mode 100644 (file)
index f08b240..0000000
--- a/build/version
+++ /dev/null
@@ -1 +0,0 @@
-2.X-devel

diff --git a/build/version.sh b/build/version.sh
new file mode 100755 (executable)
index 0000000..f39cc6e
--- /dev/null
+++ b/build/version.sh
@@ -0,0 +1,33 @@
+#! /bin/sh
+# $OpenLDAP$
+## Copyright 2000 The OpenLDAP Foundation
+## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
+## of this package for details.
+#
+ol_package=OpenLDAP
+ol_major=2
+ol_minor=X
+ol_patch=X
+ol_api=200000
+
+if test $ol_patch != X ; then
+       ol_version=${ol_major}.${ol_minor}.${ol_patch}
+       ol_type=Release
+elif test $ol_minor != X ; then
+       ol_version=${ol_major}.${ol_minor}.${ol_patch}
+       ol_type=Engineering
+else
+       ol_version=${ol_major}.${ol_minor}
+       ol_type=Devel
+fi
+
+ol_string="${ol_package} ${ol_version}-${ol_type}"
+
+echo OL_PACKAGE=\"${ol_package}\"
+echo OL_MAJOR=$ol_major
+echo OL_MINOR=$ol_minor
+echo OL_PATCH=$ol_patch
+echo OL_API=$ol_api
+echo OL_VERSION=$ol_version
+echo OL_TYPE=$ol_type
+echo OL_STRING=\"${ol_string}\"

diff --git a/configure b/configure
index 2d0378540bc6997de83d42e6707a21f87a3036e0..398a795c5f35f748da98a533569e4bdf85778ab6 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.327 2000/09/14 05:22:10 kurt Exp  
+# from OpenLDAP: pkg/ldap/configure.in,v 1.328 2000/09/14 05:26:29 kurt Exp  
 
 # Copyright 1998-2000 The OpenLDAP Foundation.  All Rights Reserved.
 # 
@@ -576,7 +576,7 @@ echo > confdefs.h
 
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=build/version
+ac_unique_file=build/version.sh
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
@@ -671,12 +671,12 @@ ac_config_guess="$SHELL $ac_aux_dir/config.guess"
 ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
-OL_VERSION=`cat $ac_aux_dir/version`
-if test -z "$OL_VERSION"; then
+eval `$ac_aux_dir/version.sh`
+if test -z "$OL_STRING"; then
        { echo "configure: error: could not determine version" 1>&2; exit 1; }
 fi
 
-echo "Configuring OpenLDAP $OL_VERSION ..."
+echo "Configuring $OL_STRING ..."
 
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index 31afd330f492a903e0f713bb7539770d3368312c..26aa504e81bd478c4d101e13656ac2c18d8c3dcf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ define([AC_CACHE_LOAD], )dnl
 define([AC_CACHE_SAVE], )dnl
 dnl ================================================================
 dnl Configure.in for OpenLDAP
-AC_INIT(build/version)dnl
+AC_INIT(build/version.sh)dnl
 
 # set unset (borrowed from autoconf 2.14a)
 if (unset FOO) >/dev/null 2>&1; then
@@ -44,12 +44,12 @@ $ol_unset CDPATH || test "${CDPATH+set}" != set || CDPATH=: && export CDPATH
 
 AC_CONFIG_AUX_DIR(build)dnl
 
-OL_VERSION=`cat $ac_aux_dir/version`
-if test -z "$OL_VERSION"; then
+eval `$ac_aux_dir/version.sh`
+if test -z "$OL_STRING"; then
        AC_MSG_ERROR([could not determine version])
 fi
 
-echo "Configuring OpenLDAP $OL_VERSION ..."
+echo "Configuring $OL_STRING ..."
 
 dnl Determine host platform
 dnl            we try not to use this for much