#! /bin/sh
-# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.707 2010/10/12 08:26:31 hyc Exp .
+# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.710 2011/02/17 01:56:06 hyc Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
-# Copyright 1998-2010 The OpenLDAP Foundation. All rights reserved.
+# Copyright 1998-2011 The OpenLDAP Foundation. All rights reserved.
# Restrictions apply, see COPYRIGHT and LICENSE files.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
MODULES_LIBS
SLAPI_LIBS
LIBSLAPI
-LIBSLAPITOOLS
AUTH_LIBS
ICU_LIBS
SLAPD_SLP_LIBS
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
-Copyright 1998-2010 The OpenLDAP Foundation. All rights reserved.
+Copyright 1998-2011 The OpenLDAP Foundation. All rights reserved.
Restrictions apply, see COPYRIGHT and LICENSE files.
_ACEOF
exit
TN="`$SHTOOL echo -e '%b' 2>/dev/null`"
fi
-OPENLDAP_CVS=""
-if test -d $ac_aux_dir/CVS; then
- OPENLDAP_CVS="(from CVS sources) "
+OPENLDAP_REPO=""
+if test -d $ac_aux_dir/../.git; then
+ OPENLDAP_REPO="(from Git clone) "
+elif test -d $ac_aux_dir/CVS; then
+ OPENLDAP_REPO="(from CVS checkout) "
fi
-echo "Configuring ${TB}${OL_STRING}${TN} ${OPENLDAP_CVS}..."
+echo "Configuring ${TB}${OL_STRING}${TN} ${OPENLDAP_REPO}..."
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
MODULES_LIBS=
SLAPI_LIBS=
LIBSLAPI=
-LIBSLAPITOOLS=
AUTH_LIBS=
ICU_LIBS=
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6500 "configure"' > conftest.$ac_ext
+ echo '#line 6498 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8554: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8552: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8558: \$? = $ac_status" >&5
+ echo "$as_me:8556: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8822: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8820: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8826: \$? = $ac_status" >&5
+ echo "$as_me:8824: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8926: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8924: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8930: \$? = $ac_status" >&5
+ echo "$as_me:8928: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11234 "configure"
+#line 11232 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11334 "configure"
+#line 11332 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
have_odbc32=no
fi
+
+ if test $have_odbc32 = no ; then
+ { echo "$as_me:$LINENO: checking for SQLDriverConnect in -lodbc32 with windows.h" >&5
+echo $ECHO_N "checking for SQLDriverConnect in -lodbc32 with windows.h... $ECHO_C" >&6; }
+ save_LIBS="$LIBS"
+ LIBS="$LIBS -lodbc32"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <windows.h>
+ #include <sqlext.h>
+
+int
+main ()
+{
+
+ SQLDriverConnect(NULL,NULL,NULL,0,NULL,0,NULL,0);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ have_odbc32=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ have_odbc32=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$save_LIBS"
+ { echo "$as_me:$LINENO: result: $have_odbc32" >&5
+echo "${ECHO_T}$have_odbc32" >&6; }
+ fi
+
if test $have_odbc32 = yes ; then
ol_link_sql="-lodbc32"
fi
if test $ac_cv_lib_ltdl_lt_dlinit = yes; then
SLAPI_LIBS=-lltdl
- LIBSLAPI=libslapi.a
- LIBSLAPITOOLS=../libslapi.a
+ LIBSLAPI=slapi/libslapi.la
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBLTDL 1
-
# Check whether --with-xxinstall was given.
MODULES_LIBS!$MODULES_LIBS$ac_delim
SLAPI_LIBS!$SLAPI_LIBS$ac_delim
LIBSLAPI!$LIBSLAPI$ac_delim
-LIBSLAPITOOLS!$LIBSLAPITOOLS$ac_delim
AUTH_LIBS!$AUTH_LIBS$ac_delim
ICU_LIBS!$ICU_LIBS$ac_delim
SLAPD_SLP_LIBS!$SLAPD_SLP_LIBS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
cat > $BACKENDSC << ENDX
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2010 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
cat > $OVERLAYSC << ENDX
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2010 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
projects / openldap / blobdiff