1 --- configure 2009-07-13 16:18:16.000000000 -0700 |
1 --- configure.~2~ Tue Aug 2 10:28:18 2011 |
2 +++ configure.ORG 2009-12-09 21:55:48.842728000 -0800 |
2 +++ configure Tue Aug 2 10:30:32 2011 |
3 @@ -29786,6 +29786,8 @@ |
3 @@ -18793,7 +18793,8 @@ |
|
4 then |
|
5 FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" |
|
6 # Solaris |
|
7 -elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null |
|
8 +# added '-o comm' in case $0 is long |
|
9 +elif $PS -o comm -fp $$ 2> /dev/null 1>&2 |
|
10 then |
|
11 FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" |
|
12 # BSD style |
|
13 @@ -29895,6 +29896,8 @@ |
4 cat >>conftest.$ac_ext <<_ACEOF |
14 cat >>conftest.$ac_ext <<_ACEOF |
5 /* end confdefs.h. */ |
15 /* end confdefs.h. */ |
6 #include <stdlib.h> |
16 #include <stdlib.h> |
7 +int find_stack_direction (void); |
17 +int find_stack_direction (void); |
8 +#pragma no_inline (find_stack_direction) |
18 +#pragma no_inline (find_stack_direction) |
9 int find_stack_direction () |
19 int find_stack_direction () |
10 { |
20 { |
11 static char *addr = 0; |
21 static char *addr = 0; |
12 @@ -31470,6 +31472,8 @@ |
22 @@ -31579,6 +31582,8 @@ |
13 cat >>conftest.$ac_ext <<_ACEOF |
23 cat >>conftest.$ac_ext <<_ACEOF |
14 /* end confdefs.h. */ |
24 /* end confdefs.h. */ |
15 $ac_includes_default |
25 $ac_includes_default |
16 +int find_stack_direction (void); |
26 +int find_stack_direction (void); |
17 +#pragma no_inline (find_stack_direction) |
27 +#pragma no_inline (find_stack_direction) |
18 int |
28 int |
19 find_stack_direction () |
29 find_stack_direction () |
20 { |
30 { |
21 @@ -47617,7 +47617,7 @@ |
31 @@ -45360,7 +45365,7 @@ |
22 fi |
32 fi |
23 |
33 |
24 # if there is no readline, but we want to build with readline, we fail |
34 # if there is no readline, but we want to build with readline, we fail |
25 - if test "$want_to_use_readline" = "yes" && test ! -d "./cmd-line-utils/readline" |
35 - if test "$want_to_use_readline" = "yes" && test ! -d "./cmd-line-utils/readline" |
26 + if test "$want_to_use_readline" = "yes" && test ! -d "$srcdir/cmd-line-utils/readline" |
36 + if test "$want_to_use_readline" = "yes" && test ! -d "$srcdir/cmd-line-utils/readline" |
27 then |
37 then |
28 { { echo "$as_me:$LINENO: error: This commercially licensed MySQL source package can't |
38 { { $as_echo "$as_me:$LINENO: error: This commercially licensed MySQL source package can't |
29 be built with libreadline. Please use --with-libedit to use |
39 be built with libreadline. Please use --with-libedit to use |