3 # Patch managed by http://www.holgerschurig.de/patcher.html
6 Index: mysql-4.1.10a/acinclude.m4
7 ===================================================================
8 --- mysql-4.1.10a.orig/acinclude.m4 2005-03-12 17:51:18.685178808 -0500
9 +++ mysql-4.1.10a/acinclude.m4 2005-03-12 17:51:18.955137768 -0500
11 # Local macros for automake & autoconf
13 +AH_TEMPLATE([SPRINTF_RETURNS_INT], [sprintf returns an int])
14 +AH_TEMPLATE([SPRINTF_RETURNS_PTR], [sprintf returns a char *])
15 +AH_TEMPLATE([SPRINTF_RETURNS_GARBAGE], [sprintf returns something unknown to us])
17 +AC_DEFUN([MYSQL_SPRINTF_RET], [
18 + AC_CACHE_CHECK([return type of sprintf],
19 + [mysql_cv_func_sprintf_ret], [
20 + old_CFLAGS="$CFLAGS"
21 + CFLAGS="$CFLAGS -Werror"
24 +int sprintf(char *str, const char *format, ...);
25 + ], [mysql_cv_func_sprintf_ret=int],
28 +char * sprintf(char *str, const char *format, ...);
29 + ], [mysql_cv_func_sprintf_ret=ptr],
30 + [mysql_cv_func_sprintf_ret=unknown])
32 + CFLAGS="$old_CFLAGS"
34 + if test x"$mysql_cv_func_sprintf_ret" = "xint"; then
35 + AC_DEFINE([SPRINTF_RETURNS_INT], [1])
36 + elif test x"$mysql_cv_func_sprintf_ret" = "xptr"; then
37 + AC_DEFINE([SPRINTF_RETURNS_PTR], [1])
39 + AC_DEFINE([SPRINTF_RETURNS_GARBAGE], [1])
43 +# _MYSQL_FUNC_ATOMIC_ADD
44 +# ----------------------
45 +# Check for Linux specific atomic_add function
46 +AC_DEFUN([_MYSQL_FUNC_ATOMIC_ADD],
47 +[AC_CACHE_CHECK([for atomic_add], [mysql_cv_func_atomic_add],
48 +[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <asm/atomic.h>]],
56 + return atomic_read(&v) == 28 ? 0 : -1;
59 + [mysql_cv_func_atomic_add=yes],
60 + [mysql_cv_func_atomic_add=no])])
61 + if test x"$mysql_func_atomic_add" = "xyes"; then
62 + AC_DEFINE([HAVE_ATOMIC_ADD], [1])
64 +])# _MYSQL_FUNC_ATOMIC_ADD
66 +# _MYSQL_FUNC_ATOMIC_SUB
67 +# ----------------------
68 +# Check for Linux specific atomic_sub function
69 +AC_DEFUN([_MYSQL_FUNC_ATOMIC_SUB],
70 +[AC_CACHE_CHECK([for atomic_sub], [mysql_cv_func_atomic_sub],
71 +[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <asm/atomic.h>]],
79 + return atomic_read(&v) == 18 ? 0 : -1;
82 + [mysql_cv_func_atomic_sub=yes],
83 + [mysql_cv_func_atomic_sub=no])])
84 + if test x"$mysql_func_atomic_sub" = "xyes"; then
85 + AC_DEFINE([HAVE_ATOMIC_SUB], [1])
87 +])# _MYSQL_FUNC_ATOMIC_SUB
91 +# Check for Linux specific atomic add and sub functions
92 +AC_DEFUN([MYSQL_FUNCS_ATOMIC], [
93 + AC_REQUIRE([_MYSQL_FUNC_ATOMIC_ADD])dnl
94 + AC_REQUIRE([_MYSQL_FUNC_ATOMIC_SUB])dnl
95 +])# MYSQL_FUNCS_ATOMIC
97 AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY], [
98 AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared,
100 AC_DEFUN([MYSQL_CHECK_ULONG],
101 [AC_MSG_CHECKING(for type ulong)
102 AC_CACHE_VAL(ac_cv_ulong,
103 -[AC_TRY_RUN([#include <stdio.h>
104 +[AC_TRY_LINK([#include <stdio.h>
105 #include <sys/types.h>
109 AC_DEFUN([MYSQL_CHECK_UCHAR],
110 [AC_MSG_CHECKING(for type uchar)
111 AC_CACHE_VAL(ac_cv_uchar,
112 -[AC_TRY_RUN([#include <stdio.h>
113 +[AC_TRY_LINK([#include <stdio.h>
114 #include <sys/types.h>
118 AC_DEFUN([MYSQL_CHECK_UINT],
119 [AC_MSG_CHECKING(for type uint)
120 AC_CACHE_VAL(ac_cv_uint,
121 -[AC_TRY_RUN([#include <stdio.h>
122 +[AC_TRY_LINK([#include <stdio.h>
123 #include <sys/types.h>
127 AC_DEFUN([MYSQL_CHECK_IN_ADDR_T],
128 [AC_MSG_CHECKING(for type in_addr_t)
129 AC_CACHE_VAL(ac_cv_in_addr_t,
130 -[AC_TRY_RUN([#include <stdio.h>
131 +[AC_TRY_LINK([#include <stdio.h>
132 #include <sys/types.h>
133 #include <sys/socket.h>
134 #include <netinet/in.h>
136 AC_DEFUN([MYSQL_CHECK_FP_EXCEPT],
137 [AC_MSG_CHECKING(for type fp_except)
138 AC_CACHE_VAL(ac_cv_fp_except,
139 -[AC_TRY_RUN([#include <stdio.h>
140 +[AC_TRY_LINK([#include <stdio.h>
141 #include <sys/types.h>
144 Index: mysql-4.1.10a/configure.in
145 ===================================================================
146 --- mysql-4.1.10a.orig/configure.in 2005-03-12 17:51:18.685178808 -0500
147 +++ mysql-4.1.10a/configure.in 2005-03-12 17:51:18.957137464 -0500
150 AC_PATH_PROG(AS, as, as)
152 -# Still need ranlib for readline; local static use only so no libtool.
155 #AC_LIBTOOL_WIN32_DLL
158 AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
159 AC_CHECK_PROG(DVIS, tex, manual.dvi)
161 -AC_MSG_CHECKING("return type of sprintf")
163 -#check the return type of sprintf
164 -case $SYSTEM_TYPE in
166 - AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int")
174 - if((int)sprintf(buf, s) == strlen(s))
180 - [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
181 - AC_MSG_RESULT("int")],
187 - if((char*)sprintf(buf,s) == buf + strlen(s))
191 - [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
192 - AC_MSG_RESULT("ptr")],
193 - [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
194 - AC_MSG_RESULT("garbage")])
201 # option, cache_name, variable,
202 # code to execute if yes, code to exectute if fail
206 if test "$TARGET_LINUX" = "true"; then
207 - AC_MSG_CHECKING([for atomic operations])
211 -#include <asm/atomic.h>
216 - atomic_set(&v, 23);
218 - return atomic_read(&v) == 28 ? 0 : -1;
221 - [AC_DEFINE([HAVE_ATOMIC_ADD], [1],
222 - [atomic_add() from <asm/atomic.h> (Linux only)])
223 - atom_ops="${atom_ops}atomic_add "],
226 -#include <asm/atomic.h>
231 - atomic_set(&v, 23);
233 - return atomic_read(&v) == 18 ? 0 : -1;
236 - [AC_DEFINE([HAVE_ATOMIC_SUB], [1],
237 - [atomic_sub() from <asm/atomic.h> (Linux only)])
238 - atom_ops="${atom_ops}atomic_sub "],
241 - if test -z "$atom_ops"; then atom_ops="no"; fi
242 - AC_MSG_RESULT($atom_ops)
246 [ --with-pstack Use the pstack backtrace library],
247 @@ -930,13 +856,13 @@
248 # Later in this script LIBS will be augmented with a threads library.
249 NON_THREADED_LIBS="$LIBS"
251 -AC_MSG_CHECKING([for int8])
252 +AC_CACHE_CHECK([for int8], [mysql_cv_type_int8], [
255 - AC_MSG_RESULT([no])
256 + mysql_cv_type_int8=no
260 +AC_LINK_IFELSE([AC_LANG_PROGRAM([[
264 @@ -947,22 +873,21 @@
266 #ifdef HAVE_SYS_TYPES_H
267 #include <sys/types.h>
277 -[AC_DEFINE([HAVE_INT_8_16_32], [1],
278 - [whether int8, int16 and int32 types exist])
279 -AC_MSG_RESULT([yes])],
280 -[AC_MSG_RESULT([no])]
282 +}])], [mysql_cv_type_int8=yes], [mysql_cv_type_int8=no])
286 +if test x"$mysql_cv_type_int8" = "xyes"; then
287 + AC_DEFINE([HAVE_INT_8_16_32], [1],
288 + [whether int8, int16 and int32 types exist])
293 # Some system specific hacks
295 @@ -1783,7 +1708,7 @@
296 AC_MSG_ERROR("MySQL needs a long long type.")
298 # off_t is not a builtin type
299 -MYSQL_CHECK_SIZEOF(off_t, 4)
300 +AC_CHECK_SIZEOF(off_t, 4)
301 if test "$ac_cv_sizeof_off_t" -eq 0
303 AC_MSG_ERROR("MySQL needs a off_t type.")
304 Index: mysql-4.1.10a/innobase/configure.in
305 ===================================================================
306 --- mysql-4.1.10a.orig/innobase/configure.in 2005-03-12 17:51:18.685178808 -0500
307 +++ mysql-4.1.10a/innobase/configure.in 2005-03-12 17:52:45.208025336 -0500
311 AM_CONFIG_HEADER(ib_config.h)
312 +AC_CONFIG_AUX_DIR([..])
313 AM_INIT_AUTOMAKE(ib, 0.90)
315 # This is need before AC_PROG_CC
317 CXXFLAGS="$CXXFLAGS "
323 AC_CHECK_HEADERS(aio.h sched.h)