diff options
| -rw-r--r-- | autoconf/configure.ac | 22 | ||||
| -rwxr-xr-x | configure | 39 |
2 files changed, 36 insertions, 25 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index b8d4a30715..d186b0ea66 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -1325,13 +1325,21 @@ dnl Try to find Darwin specific crash reporting libraries. AC_CHECK_HEADERS([CrashReporterClient.h]) dnl Try to find Darwin specific crash reporting global. -AC_LINK_IFELSE([AC_LANG_PROGRAM([[const char *__crashreporter_info__;]], [[]])],[darwin_crashreport = yes],[darwin_crashreport = no]) -AC_MSG_RESULT($darwin_crashreport) -if test "x$darwin_crashreport = xyes" -then - AC_DEFINE([HAVE_CRASHREPORTER_INFO],[1], - [Define if __crashreporter_info__ exists.]) -fi +AC_MSG_CHECKING([__crashreporter_info__]) +AC_LINK_IFELSE( + AC_LANG_SOURCE( + [[extern const char *__crashreporter_info__; + int main() { + __crashreporter_info__ = "test"; + return 0; + } + ]]), + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_CRASHREPORTER_INFO, 1, Can use __crashreporter_info__), + AC_MSG_RESULT(no) + AC_DEFINE(HAVE_CRASHREPORTER_INFO, 0, + Define if __crashreporter_info__ exists.)) + dnl===-----------------------------------------------------------------------=== dnl=== dnl=== SECTION 7: Check for types and structures @@ -17419,20 +17419,20 @@ fi done +{ echo "$as_me:$LINENO: checking __crashreporter_info__" >&5 +echo $ECHO_N "checking __crashreporter_info__... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -const char *__crashreporter_info__; -int -main () -{ +extern const char *__crashreporter_info__; + int main() { + __crashreporter_info__ = "test"; + return 0; + } - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" @@ -17468,27 +17468,30 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - darwin_crashreport = yes + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CRASHREPORTER_INFO 1 +_ACEOF + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - darwin_crashreport = no -fi - -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $darwin_crashreport" >&5 -echo "${ECHO_T}$darwin_crashreport" >&6; } -if test "x$darwin_crashreport = xyes" -then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } cat >>confdefs.h <<\_ACEOF -#define HAVE_CRASHREPORTER_INFO 1 +#define HAVE_CRASHREPORTER_INFO 0 _ACEOF fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + { echo "$as_me:$LINENO: checking for HUGE_VAL sanity" >&5 |