components/mysql-5-1/patches/configure.patch
author Norm Jacobs <Norm.Jacobs@Oracle.COM>
Tue, 02 Aug 2011 11:45:27 -0700
changeset 449 c9c78bf19cd7
parent 444 a2a87847a213
permissions -rw-r--r--
7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
--- configure.~2~	Tue Aug  2 10:28:18 2011
+++ configure	Tue Aug  2 10:30:32 2011
@@ -18793,7 +18793,8 @@
 then
   FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
 # Solaris
-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
+# added '-o comm' in case $0 is long
+elif $PS -o comm -fp $$ 2> /dev/null 1>&2
 then
   FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
 # BSD style
@@ -29895,6 +29896,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
+int find_stack_direction (void);
+#pragma no_inline (find_stack_direction)
  int find_stack_direction ()
  {
    static char *addr = 0;
@@ -31579,6 +31582,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+int find_stack_direction (void);
+#pragma no_inline (find_stack_direction)
 int
 find_stack_direction ()
 {
@@ -45360,7 +45365,7 @@
     fi
 
     # if there is no readline, but we want to build with readline, we fail
-    if test "$want_to_use_readline" = "yes" && test ! -d "./cmd-line-utils/readline"
+    if test "$want_to_use_readline" = "yes" && test ! -d "$srcdir/cmd-line-utils/readline"
     then
 	{ { $as_echo "$as_me:$LINENO: error: This commercially licensed MySQL source package can't
 	      be built with libreadline. Please use --with-libedit to use