From f4cc27c0e53b1483f3c4e2e20017c6c027fdeb9a Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 28 Feb 2011 02:32:44 +0000 Subject: [PATCH] Regenerate for ITS#3272 and #6125 --- configure | 87 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 70 insertions(+), 17 deletions(-) diff --git a/configure b/configure index 069685f954..7ef3736e8b 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /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. # @@ -950,7 +950,6 @@ TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI -LIBSLAPITOOLS AUTH_LIBS ICU_LIBS SLAPD_SLP_LIBS @@ -4544,7 +4543,6 @@ TLS_LIBS= MODULES_LIBS= SLAPI_LIBS= LIBSLAPI= -LIBSLAPITOOLS= AUTH_LIBS= ICU_LIBS= @@ -6497,7 +6495,7 @@ ia64-*-hpux*) ;; *-*-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=$? @@ -8551,11 +8549,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: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. @@ -8819,11 +8817,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: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. @@ -8923,11 +8921,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: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 @@ -11231,7 +11229,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&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 + #include + +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 @@ -38426,8 +38482,7 @@ echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlinit" >&6; } 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 @@ -39256,7 +39311,6 @@ fi - # Check whether --with-xxinstall was given. @@ -40116,7 +40170,6 @@ TLS_LIBS!$TLS_LIBS$ac_delim 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 @@ -40127,7 +40180,7 @@ SLAPD_SQL_INCLUDES!$SLAPD_SQL_INCLUDES$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 -- 2.39.5