1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -77,6 +77,7 @@ BASE_MACHINE_TYPE=$MACHINE_TYPE
case $MACHINE_TYPE in
i?86) BASE_MACHINE_TYPE=i386 ;;
esac
+AC_SUBST(CC_FOR_BUILD)
# Save some variables and the command line options for mysqlbug
SAVE_ASFLAGS="$ASFLAGS"
@@ -230,33 +231,46 @@ case $SYSTEM_TYPE in
AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int")
;;
*)
-AC_TRY_RUN([
- int main()
- {
- char* s = "hello";
- char buf[6];
- if((int)sprintf(buf, s) == strlen(s))
- return 0;
-
- return -1;
- }
- ],
- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
- AC_MSG_RESULT("int")],
- [AC_TRY_RUN([
- int main()
- {
- char* s = "hello";
- char buf[6];
- if((char*)sprintf(buf,s) == buf + strlen(s))
- return 0;
- return -1;
- } ],
- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
- AC_MSG_RESULT("ptr")],
- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
- AC_MSG_RESULT("garbage")])
- ])
+ AC_RUN_IFELSE([
+ int main()
+ {
+ char* s = "hello";
+ char buf[6];
+ if((int)sprintf(buf, s) == strlen(s))
+ return 0;
+ return -1;
+ }
+ ],
+ [
+ AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
+ AC_MSG_RESULT("int")
+ ],
+ [
+ AC_TRY_RUN([
+ int main()
+ {
+ char* s = "hello";
+ char buf[6];
+ if((char*)sprintf(buf,s) == buf + strlen(s))
+ return 0;
+ return -1;
+ }
+ ],
+ [
+ AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
+ AC_MSG_RESULT("ptr")
+ ],
+ [
+ AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
+ AC_MSG_RESULT("garbage")
+ ]
+ )
+ ],
+ [
+ AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
+ AC_MSG_RESULT("crosscompiling - assuming int")
+ ]
+ )
;;
esac
@@ -1487,14 +1501,6 @@ case "$with_mysqld_ldflags " in
esac
-# System characteristics
-case $SYSTEM_TYPE in
- *netware*) ;;
- *)
-AC_SYS_RESTARTABLE_SYSCALLS
- ;;
-esac
-
# Build optimized or debug version ?
# First check for gcc and g++
if test "$ac_cv_prog_gcc" = "yes"
@@ -1749,16 +1755,6 @@ MYSQL_TIMESPEC_TS
MYSQL_TZNAME
# Do the c++ compiler have a bool type
MYSQL_CXX_BOOL
-# Check some common bugs with gcc 2.8.# on sparc
-if ! ( expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null ); then
-MYSQL_CHECK_LONGLONG_TO_FLOAT
-if test "$ac_cv_conv_longlong_to_float" != "yes"
-then
- AC_MSG_ERROR([Your compiler cannot convert a longlong value to a float!
-If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try
-again]);
-fi
-fi
AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])
AC_CHECK_TYPES([u_int32_t])
@@ -2154,6 +2150,14 @@ AC_MSG_RESULT("$netinet_inc")
# Check for requested features
#--------------------------------------------------------------------
+AC_ARG_WITH(build-mysql,
+ AS_HELP_STRING([--with-build-mysql],[For cross compilation: path to
+ mysql which was compiled for the 'build' system.]),
+ [ BUILD_MYSQL_DIR=${withval} ],
+ [ BUILD_MYSQL_DIR="\$(top_builddir)" ]
+)
+AC_SUBST(BUILD_MYSQL_DIR)
+
MYSQL_CHECK_BIG_TABLES
MYSQL_CHECK_MAX_INDEXES
MYSQL_CHECK_REPLICATION
|
