diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2009-04-02 13:58:11 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2009-04-02 13:58:11 +0200 |
| commit | a84d45498bd861c9225080232948a99c2e317bb8 (patch) | |
| tree | 8f1f5fb7bf7ffbf6f24cf4a4fd6888a235dbcc08 /infrastructure/m4/ax_check_malloc_workaround.m4 | |
| parent | 25db897553a0db0f912602b375029e724f51556e (diff) | |
Import upstream version 0.11~rc3~r2491
Diffstat (limited to 'infrastructure/m4/ax_check_malloc_workaround.m4')
| -rw-r--r-- | infrastructure/m4/ax_check_malloc_workaround.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/infrastructure/m4/ax_check_malloc_workaround.m4 b/infrastructure/m4/ax_check_malloc_workaround.m4 index 9b1c9848..7655c0f7 100644 --- a/infrastructure/m4/ax_check_malloc_workaround.m4 +++ b/infrastructure/m4/ax_check_malloc_workaround.m4 @@ -10,16 +10,16 @@ dnl @license AllPermissive AC_DEFUN([AX_CHECK_MALLOC_WORKAROUND], [ if test "x$GXX" = "xyes"; then - AC_CACHE_CHECK([for gcc version 3 or later], [gcc_3_plus], + AC_CACHE_CHECK([for gcc version 3 or later], [box_cv_gcc_3_plus], [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #if __GNUC__ < 3 #error "Old GNU C" #endif ]])], - [gcc_3_plus=yes], [gcc_3_plus=no] + [box_cv_gcc_3_plus=yes], [box_cv_gcc_3_plus=no] )]) - if test "x$gcc_3_plus" = "xno"; then - AC_CACHE_CHECK([for malloc workaround], [malloc_workaround], + if test "x$box_cv_gcc_3_plus" = "xno"; then + AC_CACHE_CHECK([for malloc workaround], [box_cv_malloc_workaround], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #define __USE_MALLOC #include <string> @@ -27,9 +27,9 @@ AC_DEFUN([AX_CHECK_MALLOC_WORKAROUND], [ std::string s; s = "test"; ]])], - [malloc_workaround=yes], [malloc_workaround=no] + [box_cv_malloc_workaround=yes], [box_cv_malloc_workaround=no] )]) - if test "x$malloc_workaround" = "xyes"; then + if test "x$box_cv_malloc_workaround" = "xyes"; then AC_DEFINE([__USE_MALLOC], 1, [Define to 1 if __USE_MALLOC is required work around STL memory leaks]) fi |