Skip to content

Commit 67ce5da

Browse files
committed
Remove obsolete configure check for libole32 as we don't appear to use
it anymore. llvm-svn: 244012
1 parent d4a22da commit 67ce5da

File tree

3 files changed

+0
-85
lines changed

3 files changed

+0
-85
lines changed

llvm/autoconf/configure.ac

-1
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,6 @@ dnl===-----------------------------------------------------------------------===
16281628

16291629
AC_CHECK_LIB(m,sin)
16301630
if test "$llvm_cv_os_type" = "MingW" ; then
1631-
AC_CHECK_LIB(ole32, main)
16321631
AC_CHECK_LIB(psapi, main)
16331632
AC_CHECK_LIB(shell32, main)
16341633
fi

llvm/configure

-81
Original file line numberDiff line numberDiff line change
@@ -8643,87 +8643,6 @@ fi
86438643

86448644
if test "$llvm_cv_os_type" = "MingW" ; then
86458645

8646-
{ echo "$as_me:$LINENO: checking for main in -lole32" >&5
8647-
echo $ECHO_N "checking for main in -lole32... $ECHO_C" >&6; }
8648-
if test "${ac_cv_lib_ole32_main+set}" = set; then
8649-
echo $ECHO_N "(cached) $ECHO_C" >&6
8650-
else
8651-
ac_check_lib_save_LIBS=$LIBS
8652-
LIBS="-lole32 $LIBS"
8653-
cat >conftest.$ac_ext <<_ACEOF
8654-
/* confdefs.h. */
8655-
_ACEOF
8656-
cat confdefs.h >>conftest.$ac_ext
8657-
cat >>conftest.$ac_ext <<_ACEOF
8658-
/* end confdefs.h. */
8659-
8660-
8661-
int
8662-
main ()
8663-
{
8664-
return main ();
8665-
;
8666-
return 0;
8667-
}
8668-
_ACEOF
8669-
rm -f conftest.$ac_objext conftest$ac_exeext
8670-
if { (ac_try="$ac_link"
8671-
case "(($ac_try" in
8672-
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8673-
*) ac_try_echo=$ac_try;;
8674-
esac
8675-
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8676-
(eval "$ac_link") 2>conftest.er1
8677-
ac_status=$?
8678-
grep -v '^ *+' conftest.er1 >conftest.err
8679-
rm -f conftest.er1
8680-
cat conftest.err >&5
8681-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
8682-
(exit $ac_status); } &&
8683-
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
8684-
{ (case "(($ac_try" in
8685-
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8686-
*) ac_try_echo=$ac_try;;
8687-
esac
8688-
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8689-
(eval "$ac_try") 2>&5
8690-
ac_status=$?
8691-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
8692-
(exit $ac_status); }; } &&
8693-
{ ac_try='test -s conftest$ac_exeext'
8694-
{ (case "(($ac_try" in
8695-
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8696-
*) ac_try_echo=$ac_try;;
8697-
esac
8698-
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
8699-
(eval "$ac_try") 2>&5
8700-
ac_status=$?
8701-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
8702-
(exit $ac_status); }; }; then
8703-
ac_cv_lib_ole32_main=yes
8704-
else
8705-
echo "$as_me: failed program was:" >&5
8706-
sed 's/^/| /' conftest.$ac_ext >&5
8707-
8708-
ac_cv_lib_ole32_main=no
8709-
fi
8710-
8711-
rm -f core conftest.err conftest.$ac_objext \
8712-
conftest$ac_exeext conftest.$ac_ext
8713-
LIBS=$ac_check_lib_save_LIBS
8714-
fi
8715-
{ echo "$as_me:$LINENO: result: $ac_cv_lib_ole32_main" >&5
8716-
echo "${ECHO_T}$ac_cv_lib_ole32_main" >&6; }
8717-
if test $ac_cv_lib_ole32_main = yes; then
8718-
cat >>confdefs.h <<_ACEOF
8719-
#define HAVE_LIBOLE32 1
8720-
_ACEOF
8721-
8722-
LIBS="-lole32 $LIBS"
8723-
8724-
fi
8725-
8726-
87278646
{ echo "$as_me:$LINENO: checking for main in -lpsapi" >&5
87288647
echo $ECHO_N "checking for main in -lpsapi... $ECHO_C" >&6; }
87298648
if test "${ac_cv_lib_psapi_main+set}" = set; then

llvm/include/llvm/Config/config.h.in

-3
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,6 @@
140140
/* Define to 1 if you have the `m' library (-lm). */
141141
#undef HAVE_LIBM
142142

143-
/* Define to 1 if you have the `ole32' library (-lole32). */
144-
#undef HAVE_LIBOLE32
145-
146143
/* Define to 1 if you have the `psapi' library (-lpsapi). */
147144
#undef HAVE_LIBPSAPI
148145

0 commit comments

Comments
 (0)