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 8b5d743a0c367997a644b73622b98252957e0d61..16b135293616700c63077e9a1a601681d4442fdd 100644 (file)
--- a/contrib/ldaptcl/configure.in
+++ b/contrib/ldaptcl/configure.in
@@ -2,10 +2,12 @@ dnl   This file is an input file used by the GNU "autoconf" program to
 dnl    generate the file "configure", which is run during Tk installation
 dnl    to configure the system for the local environment.
 AC_INIT(neoXldap.c)
-# $Id: configure.in,v 1.15 1998/05/22 21:26:25 kunkee Exp $
+# $OpenLDAP$
 
-NEO_VERSION=1.0
-NEO_MAJOR_VERSION=1
+AC_REVISION([$Id$])
+
+NEO_VERSION=2.0
+NEO_MAJOR_VERSION=2
 NEO_MINOR_VERSION=0
 VERSION=${NEO_VERSION}
 
@@ -16,16 +18,6 @@ if test "${exec_prefix}" = "NONE"; then
     exec_prefix=$prefix
 fi
 
-AC_ARG_ENABLE(gcc, [  --enable-gcc            allow use of gcc if available],
-    [neo_ok=$enableval], [neo_ok=no])
-if test "$neo_ok" = "yes"; then
-    AC_PROG_CC
-else
-    CC=${CC-cc}
-    AC_SUBST(CC)
-fi
-AC_PROG_CPP
-
 AC_ARG_ENABLE(gcc, [  --enable-gcc            allow use of gcc if available],
     [neo_ok=$enableval], [neo_ok=no])
 if test "$neo_ok" = "yes"; then
@@ -62,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
@@ -109,8 +102,8 @@ DL_LIBS=$TCL_DL_LIBS
 LD_FLAGS=$TCL_LD_FLAGS
 NEO_LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
 
-eval "NEO_SHARED_LIB_FILE=libldap${TCL_SHARED_LIB_SUFFIX}"
-eval "NEO_UNSHARED_LIB_FILE=libldap${TCL_UNSHARED_LIB_SUFFIX}"
+eval "NEO_SHARED_LIB_FILE=libldaptcl${TCL_SHARED_LIB_SUFFIX}"
+eval "NEO_UNSHARED_LIB_FILE=libldaptcl${TCL_UNSHARED_LIB_SUFFIX}"
 
 #--------------------------------------------------------------------
 #      The statements below define a collection of symbols related to
@@ -123,10 +116,10 @@ eval "NEO_UNSHARED_LIB_FILE=libldap${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}"
+    MAKE_LIB="\${SHLIB_LD} $TCL_LIB_HNAME -o ${NEO_LIB_FILE} \${OBJS} \${LDAP_LIBFLAGS}"
     RANLIB=":"
 else
     NEO_SHLIB_CFLAGS=""
@@ -155,7 +148,7 @@ AC_ARG_WITH(ldap-incdir, [  --with-ldap-incdir=<dir>    path to ldap.h],
 
 ldaplibdir=$ldapdir/lib
 AC_ARG_WITH(ldap-libdir, [  --with-ldap-libdir=<dir>    path to ldap and lber libs],
-       [ldapincdir=$withval])
+       [ldaplibdir=$withval])
 
 AC_ARG_WITH(ldap-libraries, [  --with-ldap-libflags=<libnames>   -l flags for ldap libraries],
        [ldaplibflags="-L$ldaplibdir $withval"],
@@ -169,6 +162,7 @@ AC_SUBST(ldaplibflags)
 AC_SUBST(ldapinclude)
 AC_SUBST(ldapbuild)
 AC_SUBST(ldapdir)
+AC_SUBST(ldapincdir)
 
 
 VERSION=${NEO_VERSION}