From 0c132ee2a1be2a4f6ce081bc883d88dcd810e8b8 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 13 Mar 2006 00:25:36 +0000 Subject: Instead of listing a set of compilers that prefers __func__ to __FUNCTION__, use autoconf. Also, prefer __func__ in our own code: __func__ is a C99 standard, whereas __FUNCTION__ is not. [Fixes bug 254.] svn:r6144 --- configure.in | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index ed8f94130e..c744049803 100644 --- a/configure.in +++ b/configure.in @@ -491,6 +491,45 @@ AC_CHECK_FUNC(gethostbyname_r, [ CFLAGS=$OLD_CFLAGS ]) +AC_CACHE_CHECK([whether the C compiler supports __func__], + ac_cv_have_func_macro, + AC_COMPILE_IFELSE([ +#include +int main(int c, char **v) { puts(__func__); }], + ac_cv_have_func_macro=yes, + ac_cv_have_func_macro=no)) + +AC_CACHE_CHECK([whether the C compiler supports __FUNC__], + ac_cv_have_FUNC_macro, + AC_COMPILE_IFELSE([ +#include +int main(int c, char **v) { puts(__FUNC__); }], + ac_cv_have_FUNC_macro=yes, + ac_cv_have_FUNC_macro=no)) + +AC_CACHE_CHECK([whether the C compiler supports __FUNCTION__], + ac_cv_have_FUNCTION_macro, + AC_COMPILE_IFELSE([ +#include +int main(int c, char **v) { puts(__FUNCTION__); }], + ac_cv_have_FUNCTION_macro=yes, + ac_cv_have_FUNCTION_macro=no)) + +if test $ac_cv_have_func_macro = 'yes'; then + AC_DEFINE(HAVE_MACRO__func__, 1, [Defined if the compiler supports __func__]) +fi + + +if test $ac_cv_have_FUNC_macro = 'yes'; then + AC_DEFINE(HAVE_MACRO__FUNC__, 1, [Defined if the compiler supports __FUNC__]) +fi + +if test $ac_cv_have_FUNCTION_macro = 'yes'; then + AC_DEFINE(HAVE_MACRO__FUNCTION__, 1, + [Defined if the compiler supports __FUNCTION__]) +fi + + # $prefix stores the value of the --prefix command line option, or # NONE if the option wasn't set. In the case that it wasn't set, make # it be the default, so that we can use it to expand directories now. -- cgit v1.2.3-54-g00ecf