1 files changed, 22 insertions, 14 deletions
diff --git a/bdb/dist/s_config b/bdb/dist/s_config
index 870109c38f9..3e033da81ab 100755
--- a/bdb/dist/s_config
+++ b/bdb/dist/s_config
@@ -1,15 +1,16 @@
 #!/bin/sh -
-#	$Id: s_config,v 1.3 2000/07/13 18:38:46 bostic Exp $
+#	$Id: s_config,v 1.9 2002/05/20 19:18:13 bostic Exp $
 #
 # Build the autoconfiguration files.
 
-msgm4="dnl DO NOT EDIT: automatically built by dist/s_config."
+trap 'rm -f aclocal.m4 ; exit 0' 0 1 2 3 13 15
+
+msgac="# DO NOT EDIT: automatically built by dist/s_config."
 
 . ./RELEASE
 
 echo "Building aclocal.m4"
-rm -f aclocal.m4
-(echo "$msgm4" &&
+(echo "$msgac" &&
  echo "AC_DEFUN(AM_VERSION_SET, [" &&
  echo "AC_SUBST(DB_VERSION_MAJOR)" &&
  echo "DB_VERSION_MAJOR=$DB_VERSION_MAJOR" &&
@@ -17,21 +18,28 @@ rm -f aclocal.m4
  echo "DB_VERSION_MINOR=$DB_VERSION_MINOR" &&
  echo "AC_SUBST(DB_VERSION_PATCH)" &&
  echo "DB_VERSION_PATCH=$DB_VERSION_PATCH" &&
+ echo "AC_SUBST(DB_VERSION_UNIQUE_NAME)" &&
+ echo "DB_VERSION_UNIQUE_NAME=$DB_VERSION_UNIQUE_NAME" &&
  echo "AC_SUBST(DB_VERSION_STRING)" &&
  echo "DB_VERSION_STRING=\"\\\"$DB_VERSION_STRING\\\"\"" &&
- echo "])dnl" &&
- cat aclocal/*.m4) > aclocal.m4
-chmod 444 aclocal.m4
+ echo "])" &&
+ cat aclocal/*.ac aclocal_java/*.ac) > aclocal.m4
 
+echo "Running autoheader to build config.hin"
 rm -f config.hin
-echo "Building config.hin (autoheader)"
-(autoheader configure.in > config.hin) 2>&1 | \
-    sed '/warning: AC_TRY_RUN called without default/d'
+autoheader
 chmod 444 config.hin
 
+echo "Running autoconf to build configure"
 rm -f configure
-echo "Building configure (autoconf)"
-autoconf 2>&1 | sed '/warning: AC_TRY_RUN called without default/d'
+autoconf
+
+# Edit version information we couldn't pre-compute.
+(echo "1,\$s/__EDIT_DB_VERSION__/$DB_VERSION/g" &&
+ echo "w" &&
+ echo "q") | ed configure
+
+rm -rf autom4te.cache
+chmod 555 configure
 
-chmod 555 configure config.guess config.sub install-sh
-rm -f aclocal.m4
+chmod 555 config.guess config.sub install-sh