Fix shtool %b/%B handling

diff --git a/CHANGES b/CHANGES
index 626fa8690286f172ded41deb1b36d9fdb0d1c947..baab86b00dfb5cb2edeedce8508f8cead5705ab6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,12 @@
 OpenLDAP 2.1 Change Log
 
+OpenLDAP 2.1.9 Engineering
+       Build Enviroment
+               Fix configure shtool no bold handling
+
 OpenLDAP 2.1.8 Release
        Build Enviroment
-               Updated configure script
+               Update configure script
 
 OpenLDAP 2.1.7 Release
        Fixed liblber bvarray_add bug (ITS#2142)

diff --git a/build/version.sh b/build/version.sh
index 3f3d5a57772995e97b9352199d0249ee0f4cda9a..a0d7a02b1a59fa3f6e75fc7281ac1f9755bf752e 100755 (executable)
--- a/build/version.sh
+++ b/build/version.sh
@@ -7,7 +7,7 @@
 ol_package=OpenLDAP
 ol_major=2
 ol_minor=1
-ol_patch=8
+ol_patch=X
 ol_api_inc=20108
 ol_api_lib=2:108:0
 

diff --git a/configure.in b/configure.in
index 70697c53e8df492ecb79e7b625495261a75dfc2e..a15d7083d483e8df8f3bd3a289436f44003ef20e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -60,8 +60,8 @@ fi
 SHTOOL="$ac_cv_shtool"
 dnl AC_SUBST(SHTOOL)dnl
 
-TB=`$SHTOOL echo -e %B`
-TN=`$SHTOOL echo -e %b`
+TB=`($SHTOOL echo -e '%B') 2>/dev/null`
+TN=`($SHTOOL echo -e '%b') 2>/dev/null`
 
 echo "Configuring $TB$OL_STRING$TN ..."