diff options
author | lenz@mysql.com <> | 2002-07-15 13:33:56 +0200 |
---|---|---|
committer | lenz@mysql.com <> | 2002-07-15 13:33:56 +0200 |
commit | 8c827e2800e91197245b5c49c79bd84fcebfb2d5 (patch) | |
tree | 6ea8f94adc277510ee95c6b505ea9aaeba4364d1 /bdb/dist | |
parent | f07ddef788350fdbc7ce242bd590af2e361999bb (diff) | |
download | mariadb-git-8c827e2800e91197245b5c49c79bd84fcebfb2d5.tar.gz |
Added some patches provided by SuSE to fix build problems on
ppc64 and x86-64, fixed a compile bug when building with TCP wrapper
support on Linux
Diffstat (limited to 'bdb/dist')
-rw-r--r-- | bdb/dist/acconfig.h | 1 | ||||
-rw-r--r-- | bdb/dist/aclocal/mutex.m4 | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/bdb/dist/acconfig.h b/bdb/dist/acconfig.h index e30d0e3d2c2..19f85a460d9 100644 --- a/bdb/dist/acconfig.h +++ b/bdb/dist/acconfig.h @@ -52,6 +52,7 @@ #undef HAVE_MUTEX_WIN16 #undef HAVE_MUTEX_WIN32 #undef HAVE_MUTEX_X86_GCC_ASSEMBLY +#undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY /* Define if building on QNX. */ #undef HAVE_QNX diff --git a/bdb/dist/aclocal/mutex.m4 b/bdb/dist/aclocal/mutex.m4 index 5f16ee0e114..a6b1fa1a053 100644 --- a/bdb/dist/aclocal/mutex.m4 +++ b/bdb/dist/aclocal/mutex.m4 @@ -314,6 +314,18 @@ AC_TRY_RUN([main(){ }], [db_cv_mutex="x86/gcc-assembly"]) fi +dnl x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux +if test "$db_cv_mutex" = no; then +AC_TRY_RUN([main(){ +#if defined(x86_64) || defined(__x86_64__) +#if defined(__GNUC__) + exit(0); +#endif +#endif + exit(1); +}], [db_cv_mutex="x86_64/gcc-assembly"]) +fi + dnl ia86/gcc: Linux if test "$db_cv_mutex" = no; then AC_TRY_RUN([main(){ |