Commit 4f4d2de1 authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

import fix to ITS#4735

parent 2fab3676
......@@ -10,6 +10,8 @@ OpenLDAP 2.3.29 Engineering
Fixed slapo-dynlist leaks (ITS#4664)
Fixed slapo-ppolicy leaks (ITS#4665)
Fixed slapo-syncprov deadlock (ITS#4720)
Build environment
Added selection of ODBC (ITS#4735)
Documentation
Fixed slapd-ldap/meta(5) rebind-as-user usage (ITS#4715)
Fixed slapd-ldap/meta(5) missing network-timeout (ITS#4718)
......
#! /bin/sh
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.560.2.29 2006/04/05 21:36:14 kurt Exp .
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.560.2.30 2006/07/28 14:53:03 kurt Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
......@@ -1087,6 +1087,7 @@ Optional Packages:
--with-tls with TLS/SSL support [auto]
--with-yielding-select with implicitly yielding select [auto]
--with-mp with multiple precision statistics auto|longlong|long|bignum|gmp [auto]
--with-odbc with specific ODBC support iodbc|unixodbc|auto [auto]
 
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-pic try to use only PIC/non-PIC objects [default=use
......@@ -2449,6 +2450,29 @@ else
ol_with_mp="auto"
fi; # end --with-mp
 
# OpenLDAP --with-odbc
# Check whether --with-odbc or --without-odbc was given.
if test "${with_odbc+set}" = set; then
withval="$with_odbc"
ol_arg=invalid
for ol_val in auto iodbc unixodbc ; do
if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
done
if test "$ol_arg" = "invalid" ; then
{ { echo "$as_me:$LINENO: error: bad value $withval for --with-odbc" >&5
echo "$as_me: error: bad value $withval for --with-odbc" >&2;}
{ (exit 1); exit 1; }; }
fi
ol_with_odbc="$ol_arg"
else
ol_with_odbc="auto"
fi; # end --with-odbc
 
 
# Check whether --enable-xxslapdoptions or --disable-xxslapdoptions was given.
......@@ -5713,7 +5737,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 5716 "configure"' > conftest.$ac_ext
echo '#line 5740 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
......@@ -7693,11 +7717,11 @@ else
-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:7696: $lt_compile\"" >&5)
(eval echo "\"\$as_me:7720: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:7700: \$? = $ac_status" >&5
echo "$as_me:7724: \$? = $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.
......@@ -7955,11 +7979,11 @@ else
-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:7958: $lt_compile\"" >&5)
(eval echo "\"\$as_me:7982: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:7962: \$? = $ac_status" >&5
echo "$as_me:7986: \$? = $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.
......@@ -8017,11 +8041,11 @@ else
-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:8020: $lt_compile\"" >&5)
(eval echo "\"\$as_me:8044: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:8024: \$? = $ac_status" >&5
echo "$as_me:8048: \$? = $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
......@@ -10265,7 +10289,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 10268 "configure"
#line 10292 "configure"
#include "confdefs.h"
 
#if HAVE_DLFCN_H
......@@ -10363,7 +10387,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 10366 "configure"
#line 10390 "configure"
#include "confdefs.h"
 
#if HAVE_DLFCN_H
......@@ -36738,7 +36762,15 @@ done
sql_LIBS="$LIBS"
LIBS="$LTHREAD_LIBS"
 
echo "$as_me:$LINENO: checking for SQLDriverConnect in -liodbc" >&5
if test $ol_with_odbc = auto ; then
ol_with_odbc="iodbc unixodbc"
fi
for odbc in $ol_with_odbc ; do
if test $ol_link_sql = no ; then
case $odbc in
iodbc)
echo "$as_me:$LINENO: checking for SQLDriverConnect in -liodbc" >&5
echo $ECHO_N "checking for SQLDriverConnect in -liodbc... $ECHO_C" >&6
if test "${ac_cv_lib_iodbc_SQLDriverConnect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
......@@ -36808,10 +36840,13 @@ else
have_iodbc=no
fi
 
if test $have_iodbc = yes ; then
ol_link_sql="-liodbc"
else
echo "$as_me:$LINENO: checking for SQLDriverConnect in -lodbc" >&5
if test $have_iodbc = yes ; then
ol_link_sql="-liodbc"
fi
;;
unixodbc)
echo "$as_me:$LINENO: checking for SQLDriverConnect in -lodbc" >&5
echo $ECHO_N "checking for SQLDriverConnect in -lodbc... $ECHO_C" >&6
if test "${ac_cv_lib_odbc_SQLDriverConnect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
......@@ -36881,10 +36916,19 @@ else
have_odbc=no
fi
 
if test $have_odbc = yes ; then
ol_link_sql="-lodbc"
if test $have_odbc = yes ; then
ol_link_sql="-lodbc"
fi
;;
*)
{ { echo "$as_me:$LINENO: error: unknown ODBC library" >&5
echo "$as_me: error: unknown ODBC library" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
fi
fi
done
 
LIBS="$sql_LIBS"
 
......@@ -253,6 +253,9 @@ OL_ARG_WITH(yielding_select,
OL_ARG_WITH(mp,
[ --with-mp with multiple precision statistics auto|longlong|long|bignum|gmp],
auto, [auto longlong long bignum gmp yes no])
OL_ARG_WITH(odbc,
[ --with-odbc with specific ODBC support iodbc|unixodbc|auto],
auto, [auto iodbc unixodbc] )
dnl ----------------------------------------------------------------
dnl Server options
......@@ -2169,16 +2172,34 @@ if test $ol_enable_sql != no ; then
sql_LIBS="$LIBS"
LIBS="$LTHREAD_LIBS"
AC_CHECK_LIB(iodbc,SQLDriverConnect,[have_iodbc=yes],[have_iodbc=no])
if test $have_iodbc = yes ; then
ol_link_sql="-liodbc"
else
AC_CHECK_LIB(odbc,SQLDriverConnect,[have_odbc=yes],[have_odbc=no])
if test $have_odbc = yes ; then
ol_link_sql="-lodbc"
fi
if test $ol_with_odbc = auto ; then
ol_with_odbc="iodbc unixodbc"
fi
for odbc in $ol_with_odbc ; do
if test $ol_link_sql = no ; then
case $odbc in
iodbc)
AC_CHECK_LIB(iodbc, SQLDriverConnect, [have_iodbc=yes], [have_iodbc=no])
if test $have_iodbc = yes ; then
ol_link_sql="-liodbc"
fi
;;
unixodbc)
AC_CHECK_LIB(odbc, SQLDriverConnect, [have_odbc=yes], [have_odbc=no])
if test $have_odbc = yes ; then
ol_link_sql="-lodbc"
fi
;;
*)
AC_MSG_ERROR([unknown ODBC library])
;;
esac
fi
done
LIBS="$sql_LIBS"
if test $ol_link_sql != no ; then
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment