r15280: - remove the 2nd check for __FUNCTION__
authorStefan Metzmacher <metze@samba.org>
Wed, 26 Apr 2006 14:20:46 +0000 (14:20 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:05:01 +0000 (14:05 -0500)
- fallback to __func__ if __FUNCTION__ isn't there

metze

source/build/m4/check_cc.m4
source/lib/replace/config.m4
source/lib/replace/replace.h

index 64f44cd6ff76e1014c9231cc982d89bcc47efd06..f5b6fa09950f79db87e514edff9abea6df69b9a0 100644 (file)
@@ -187,13 +187,6 @@ AC_SUBST(HOSTCC)
 
 AC_PATH_PROG(GCOV,gcov)
 
-AC_CACHE_CHECK([for __FUNCTION__ macro],samba_cv_HAVE_FUNCTION_MACRO,[
-AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __FUNCTION__);],
-samba_cv_HAVE_FUNCTION_MACRO=yes,samba_cv_HAVE_FUNCTION_MACRO=no)])
-if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
-    AC_DEFINE(HAVE_FUNCTION_MACRO,1,[Whether there is a __FUNCTION__ macro])
-fi
-
 AC_PATH_PROG(MAKE,make)
 
 AC_CACHE_CHECK([whether we have GNU make], samba_cv_gnu_make, [
index bac38f6439e1f31d99b6934f2dc0138cf0539cf0..bf46bdcc58d78fa4400021f76b80e504df7dd156 100644 (file)
@@ -167,6 +167,14 @@ AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __FUNCTION__);],
 samba_cv_HAVE_FUNCTION_MACRO=yes,samba_cv_HAVE_FUNCTION_MACRO=no)])
 if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
     AC_DEFINE(HAVE_FUNCTION_MACRO,1,[Whether there is a __FUNCTION__ macro])
+else
+    dnl __func__ macro
+    AC_CACHE_CHECK([for __func__ macro],samba_cv_HAVE_func_MACRO,[
+    AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __func__);],
+    samba_cv_HAVE_func_MACRO=yes,samba_cv_HAVE_func_MACRO=no)])
+    if test x"$samba_cv_HAVE_func_MACRO" = x"yes"; then
+       AC_DEFINE(HAVE_func_MACRO,1,[Whether there is a __func__ macro])
+    fi
 fi
 
 AC_CHECK_HEADERS([sys/param.h])
index 77f42acc97d9b4d17ebad61d5c6297af87dae6cc..d0575f4b60bc9ab5e89a02ca2f8c29a418d1a3f3 100644 (file)
@@ -212,8 +212,12 @@ typedef int bool;
 #endif
 
 #ifndef HAVE_FUNCTION_MACRO
+#ifdef HAVE_func_MACRO
+#define __FUNCTION__ __func__
+#else
 #define __FUNCTION__ ("")
 #endif
+#endif
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>