diff options
| author | unknown <lenz@mysql.com> | 2002-10-01 21:57:10 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2002-10-01 21:57:10 +0200 |
| commit | 95baa1c1ed77fba8d7235be1c9c7d05cd322f5cb (patch) | |
| tree | 1498636efd6a0835df79c54a9044e3f8215d61cb /include | |
| parent | 985e4a8eaa6a9f691317abbae8c65809c0fd75fb (diff) | |
| download | mariadb-git-95baa1c1ed77fba8d7235be1c9c7d05cd322f5cb.tar.gz | |
- Applied required modifications for automake 1.5
- some additional small fixes
- added "depcomp" for automake 1.5
acinclude.m4:
- Removed AC_SYS_LARGEFILE (is in autoconf since v2.50)
config.guess:
- applied diffs from config.guess of automake 1.5
config.sub:
- applied diffs from config.sub of automake 1.5
configure.in:
- adapted for automake 1.5
- added AM_PROG_AS
- replaced MYSQL_SYS_LARGEFILE with AC_SYS_LARGEFILE (is in
autoconf since v2.50)
dbug/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
extra/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
heap/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
include/my_global.h:
- fix for PPC64
install-sh:
- applied diffs from install-sh of automake 1.5
isam/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
libmysql_r/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
libmysqld/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
ltconfig:
- small correction for new libtool
ltmain.sh:
- applied diffs from ltmain.sh of libtool 1.4.2
merge/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
missing:
- applied diffs from missing of automake 1.5
myisam/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
myisammrg/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
mysys/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
regex/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
sql/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
strings/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
tools/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
vio/Makefile.am:
- removed OMIT_DEPENDENCIES to make automake 1.5 happy
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 8524328a47b..d1b3c516555 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -161,7 +161,7 @@ #endif /* In Linux-ia64 including atomic.h will give us an error */ -#if (defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__ia64__)) || !defined(THREAD) +#if (defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && (defined(__ia64__)||defined(__powerpc64__))) || !defined(THREAD) #undef HAVE_ATOMIC_ADD #undef HAVE_ATOMIC_SUB #endif @@ -228,6 +228,7 @@ #endif #ifdef HAVE_ATOMIC_ADD #define __SMP__ +#define CONFIG_SMP #include <asm/atomic.h> #endif |