Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / contrib / ldaptcl / configure.in

diff --git a/contrib/ldaptcl/configure.in b/contrib/ldaptcl/configure.in
index 804c39087f399db11b8e01f09d46d5ef100d8e48..16b135293616700c63077e9a1a601681d4442fdd 100644 (file)
--- a/contrib/ldaptcl/configure.in
+++ b/contrib/ldaptcl/configure.in
@@ -4,6 +4,8 @@ dnl     to configure the system for the local environment.
 AC_INIT(neoXldap.c)
 # $OpenLDAP$
 
+AC_REVISION([$Id$])
+
 NEO_VERSION=2.0
 NEO_MAJOR_VERSION=2
 NEO_MINOR_VERSION=0
@@ -52,7 +54,8 @@ AC_ARG_WITH(tk, [  --with-tk=DIR          use Tk 8.0 binaries from DIR],
 
 case "$with_tk" in
     yes)
-       if test -f $exec_prefix/lib/tkConfig.sh -a $exec_prefix/lib/tkxConfig.sh
+       if test -f $exec_prefix/lib/tkConfig.sh &&
+          test -f $exec_prefix/lib/tkxConfig.sh
        then
            :
        else
@@ -113,7 +116,7 @@ eval "NEO_UNSHARED_LIB_FILE=libldaptcl${TCL_UNSHARED_LIB_SUFFIX}"
 AC_ARG_ENABLE(shared,
     [  --enable-shared         build libldaptcl as a shared library],
     [ok=$enableval], [ok=no])
-if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
+if test "$ok" = "yes" && test "${SHLIB_SUFFIX}" != ""; then
     NEO_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
     eval "NEO_LIB_FILE=libldaptcl${TCL_SHARED_LIB_SUFFIX}"
     MAKE_LIB="\${SHLIB_LD} $TCL_LIB_HNAME -o ${NEO_LIB_FILE} \${OBJS} \${LDAP_LIBFLAGS}"