Commit 4823bc50 authored by unknown's avatar unknown
Browse files

Merge zippy.(none):/home/cmiller/mysql-4.1_bug18470 

into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P


configure.in:
  Auto merged
parents 019e221c 4bfb28e2

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -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" = "")