diff options
| author | unknown <cmiller@zippy.(none)> | 2006-07-13 11:11:20 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-07-13 11:11:20 -0400 |
| commit | 3ff8200ac17fda202b2adc0a4f7a2bb91c8078d0 (patch) | |
| tree | abade15123a2fd253ad9ebc948ac5aeeaacd3181 /configure.in | |
| parent | a7dddd3b67e70292c0813e80ad255f1dc2f3a867 (diff) | |
| parent | 4823bc50413d11a1f8329db9cde5bc5173d365c8 (diff) | |
| download | mariadb-git-3ff8200ac17fda202b2adc0a4f7a2bb91c8078d0.tar.gz | |
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
into zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
tests/mysql_client_test.c:
manual merge
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 192b35f56d8..cf3d7b72040 100644 --- a/configure.in +++ b/configure.in @@ -651,7 +651,7 @@ AC_ARG_ENABLE(assembler, AC_MSG_CHECKING(if we should use assembler functions) # For now we only support assembler on i386 and sparc systems -AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386") +AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386" && $AS strings/strings-x86.s -o checkassembler >/dev/null 2>&1 && test -f checkassembler && (rm -f checkassembler; exit 0;)) AM_CONDITIONAL(ASSEMBLER_sparc32, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparc") AM_CONDITIONAL(ASSEMBLER_sparc64, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparcv9") AM_CONDITIONAL(ASSEMBLER, test "$ASSEMBLER_x86_TRUE" = "" -o "$ASSEMBLER_sparc32_TRUE" = "") |