From: NAKAMURA Takumi Date: Thu, 18 Jun 2015 04:16:05 +0000 (+0000) Subject: [autoconf] Detect OLE32 for mingw. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d55d7f517b21308ecc8cf9f92cc95e0abd382fe0;p=platform%2Fupstream%2Fllvm.git [autoconf] Detect OLE32 for mingw. It has been done in CMake build. llvm-svn: 239989 --- diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index 644c5ae..0942c8e 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/autoconf/configure.ac @@ -1632,6 +1632,7 @@ dnl===-----------------------------------------------------------------------=== AC_CHECK_LIB(m,sin) if test "$llvm_cv_os_type" = "MingW" ; then AC_CHECK_LIB(imagehlp, main) + AC_CHECK_LIB(ole32, main) AC_CHECK_LIB(psapi, main) AC_CHECK_LIB(shell32, main) fi diff --git a/llvm/configure b/llvm/configure index ec0e4ac..b09045e 100755 --- a/llvm/configure +++ b/llvm/configure @@ -8733,6 +8733,87 @@ _ACEOF fi +{ 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/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake index d1007e8..1712e586 100644 --- a/llvm/include/llvm/Config/config.h.cmake +++ b/llvm/include/llvm/Config/config.h.cmake @@ -131,6 +131,9 @@ /* 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). */ #cmakedefine HAVE_LIBPSAPI ${HAVE_LIBPSAPI} diff --git a/llvm/include/llvm/Config/config.h.in b/llvm/include/llvm/Config/config.h.in index 5e4e120..49d1b1f 100644 --- a/llvm/include/llvm/Config/config.h.in +++ b/llvm/include/llvm/Config/config.h.in @@ -143,6 +143,9 @@ /* 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