From 1fb8e354bb168b726664060823cfb9c8b780543d Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Wed, 5 Aug 2015 04:50:40 +0000 Subject: [PATCH] Remove obsolete configure check for libole32 as we don't appear to use it anymore. llvm-svn: 244012 --- autoconf/configure.ac | 1 - configure | 81 --------------------------------- include/llvm/Config/config.h.in | 3 -- 3 files changed, 85 deletions(-) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index bfba92e8b82..e4bb0609f57 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -1628,7 +1628,6 @@ dnl===-----------------------------------------------------------------------=== AC_CHECK_LIB(m,sin) if test "$llvm_cv_os_type" = "MingW" ; then - AC_CHECK_LIB(ole32, main) AC_CHECK_LIB(psapi, main) AC_CHECK_LIB(shell32, main) fi diff --git a/configure b/configure index 08a2cf015bc..d48dd03226a 100755 --- a/configure +++ b/configure @@ -8643,87 +8643,6 @@ fi if test "$llvm_cv_os_type" = "MingW" ; then -{ echo "$as_me:$LINENO: checking for main in -lole32" >&5 -echo $ECHO_N "checking for main in -lole32... $ECHO_C" >&6; } -if test "${ac_cv_lib_ole32_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lole32 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - 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); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ole32_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ole32_main=no -fi - -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_ole32_main" >&5 -echo "${ECHO_T}$ac_cv_lib_ole32_main" >&6; } -if test $ac_cv_lib_ole32_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBOLE32 1 -_ACEOF - - LIBS="-lole32 $LIBS" - -fi - - { echo "$as_me:$LINENO: checking for main in -lpsapi" >&5 echo $ECHO_N "checking for main in -lpsapi... $ECHO_C" >&6; } if test "${ac_cv_lib_psapi_main+set}" = set; then diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in index 4eb0bb50f7d..d9ddf8b3937 100644 --- a/include/llvm/Config/config.h.in +++ b/include/llvm/Config/config.h.in @@ -140,9 +140,6 @@ /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM -/* Define to 1 if you have the `ole32' library (-lole32). */ -#undef HAVE_LIBOLE32 - /* Define to 1 if you have the `psapi' library (-lpsapi). */ #undef HAVE_LIBPSAPI