diff options
| author | monty@mashka.mysql.fi <> | 2003-01-03 00:04:33 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-03 00:04:33 +0200 |
| commit | 07daf3169e0d55d31b2974098f9002f8508c4186 (patch) | |
| tree | 461fafebcf70ffd880e85f8342601eaade292e1b /acinclude.m4 | |
| parent | d85a01db2cd557cecc06cebe45502f54de233dac (diff) | |
| parent | 9a64d3a17c9a7a47d97cbab233679ee30f9c2a0e (diff) | |
| download | mariadb-git-07daf3169e0d55d31b2974098f9002f8508c4186.tar.gz | |
Merge with 4.0.8
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 44436bf0b6d..c9e32ea3fc3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1215,7 +1215,9 @@ changequote(, )dnl hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) changequote([, ])dnl if test "$GCC" = yes; then - ac_cv_sys_largefile_CFLAGS=-D__STDC_EXT__ + case `$CC --version 2>/dev/null` in + 2.95.*) ac_cv_sys_largefile_CFLAGS=-D__STDC_EXT__ ;; + esac fi ;; # IRIX 6.2 and later require cc -n32. @@ -1330,7 +1332,7 @@ AC_DEFUN(MYSQL_SYS_LARGEFILE, # Local version of _AC_PROG_CXX_EXIT_DECLARATION that does not -# include #stdlib.h as this breaks things on Solaris +# include #stdlib.h as default as this breaks things on Solaris # (Conflicts with pthreads and big file handling) m4_define([_AC_PROG_CXX_EXIT_DECLARATION], @@ -1340,7 +1342,8 @@ m4_define([_AC_PROG_CXX_EXIT_DECLARATION], 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ 'extern "C" void exit (int);' \ - 'void exit (int);' + 'void exit (int);' \ + '#include <stdlib.h>' do _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <stdlib.h> $ac_declaration], |