mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-27 18:19:52 -05:00
add MSVC test
This commit is contained in:
Kurt Zeilenga
parent
7bd66343b1
commit
b94b5fa82e
2 changed files with 60 additions and 12 deletions
70
configure
vendored
70
configure
vendored
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.680 2009/01/16 23:20:15 kurt Exp .
|
||||
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.682 2009/01/16 23:49:38 kurt Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61.
|
||||
#
|
||||
|
|
@ -2074,6 +2074,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -6460,7 +6462,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 6463 "configure"' > conftest.$ac_ext
|
||||
echo '#line 6465 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8529,11 +8531,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:8532: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8534: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8536: \$? = $ac_status" >&5
|
||||
echo "$as_me:8538: \$? = $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.
|
||||
|
|
@ -8791,11 +8793,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:8794: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8796: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8798: \$? = $ac_status" >&5
|
||||
echo "$as_me:8800: \$? = $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.
|
||||
|
|
@ -8853,11 +8855,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:8856: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8858: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:8860: \$? = $ac_status" >&5
|
||||
echo "$as_me:8862: \$? = $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
|
||||
|
|
@ -11064,7 +11066,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11067 "configure"
|
||||
#line 11069 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -11162,7 +11164,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11165 "configure"
|
||||
#line 11167 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -12384,6 +12386,52 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|||
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for Microsoft Visual C++" >&5
|
||||
echo $ECHO_N "checking for Microsoft Visual C++... $ECHO_C" >&6; }
|
||||
if test "${ol_cv_msvc+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#include <__FOO__/generate_error.h>
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if { (ac_try="$ac_cpp conftest.$ac_ext"
|
||||
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_cpp conftest.$ac_ext") 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); } >/dev/null && {
|
||||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
}; then
|
||||
ol_cv_msvc=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ol_cv_msvc=no
|
||||
fi
|
||||
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ol_cv_msvc" >&5
|
||||
echo "${ECHO_T}$ol_cv_msvc" >&6; }
|
||||
|
||||
ol_link_perl=no
|
||||
if test $ol_enable_perl != no ; then
|
||||
# Extract the first word of "perl", so it can be a program name with args.
|
||||
|
|
@ -14782,7 +14830,7 @@ fi
|
|||
done
|
||||
|
||||
|
||||
if test x"$ac_cv_mingw32" = xyes -o \( x"$ac_cv_cygwin" = xyes -a x"$GCC" = xno \) ; then
|
||||
if test "$ac_cv_mingw32" = yes -o "$ol_cv_msvc" = yes ; then
|
||||
|
||||
|
||||
for ac_header in winsock.h winsock2.h
|
||||
|
|
|
|||
|
|
@ -844,7 +844,7 @@ AC_CHECK_HEADERS( \
|
|||
)
|
||||
|
||||
dnl Only check Winsock on MinGW
|
||||
if test x"$ac_cv_mingw32" = xyes -o \( x"$ac_cv_cygwin" = xyes -a x"$GCC" = xno \) ; then
|
||||
if test "$ac_cv_mingw32" = yes -o "$ol_cv_msvc" = yes ; then
|
||||
AC_CHECK_HEADERS( winsock.h winsock2.h )
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue