summaryrefslogtreecommitdiff
path: root/databases/mysql51-server/files/patch-configure
diff options
context:
space:
mode:
authorDirk Froemberg <dirk@FreeBSD.org>2000-10-19 09:17:57 +0000
committerDirk Froemberg <dirk@FreeBSD.org>2000-10-19 09:17:57 +0000
commit5c5dc27ac7bb5c5e106502705a998674b9627e11 (patch)
tree14a9b1122528c707d15fea8218b8c564c5c5eebe /databases/mysql51-server/files/patch-configure
parentRename sndinfo to snd-info, to avoid conflict with audio/csound (diff)
Upgrade to MySQL-3.23.24 after repository copy from mysql322-client
and mysql322-server. - mit-pthread support was dropped. - libmysqlclient.so.9 was renamed to libmysqlclient.so.6 (like the one coming with MySQL-3.22.x) so ports depending on MySQL having a chance of using 3.23.x if installed. mysql322-(client|server) and mysql323-(client|server) can't be installed at the same time, of course.
Notes
Notes: svn path=/head/; revision=33988
Diffstat (limited to 'databases/mysql51-server/files/patch-configure')
-rw-r--r--databases/mysql51-server/files/patch-configure55
1 files changed, 37 insertions, 18 deletions
diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure
index 133bd4200860..21bf43709afc 100644
--- a/databases/mysql51-server/files/patch-configure
+++ b/databases/mysql51-server/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig Sun Feb 13 03:46:09 2000
-+++ configure Wed May 3 12:20:25 2000
-@@ -2743,7 +2743,7 @@
+--- configure.orig Fri Sep 8 09:50:33 2000
++++ configure Sat Sep 23 23:33:39 2000
+@@ -1057,7 +1057,7 @@
+ PROTOCOL_VERSION=10
+ DOT_FRM_VERSION=6
+ # See the libtool docs for information on how to do shared lib versions.
+-SHARED_LIB_VERSION=9:0:0
++SHARED_LIB_VERSION=6:0:0
+
+ # Set all version vars based on $VERSION. How do we do this more elegant ?
+ # Remember that regexps needs to quote [ and ] since this is run through m4
+@@ -2908,7 +2908,7 @@
;;
esac
fi
@@ -9,9 +18,9 @@
if test -n "$HOSTNAME"; then
echo "$ac_t""$HOSTNAME" 1>&6
else
-@@ -2871,30 +2871,7 @@
+@@ -3036,29 +3036,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
- echo "configure:2873: checking "how to check if pid exists"" >&5
+ echo "configure:3038: checking "how to check if pid exists"" >&5
PS=$ac_cv_path_PS
-# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@@ -36,12 +45,11 @@
-else
- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
-fi
--
+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
+
echo "$ac_t"""$FIND_PROC"" 1>&6
- # Check if a pid is valid
-@@ -4646,8 +4623,6 @@
+@@ -5354,8 +5332,6 @@
#define $ac_tr_lib 1
EOF
@@ -50,7 +58,7 @@
else
echo "$ac_t""no" 1>&6
fi
-@@ -4881,28 +4856,6 @@
+@@ -5578,28 +5554,6 @@
fi
@@ -79,7 +87,7 @@
# Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then
withval="$with_debug"
-@@ -5615,10 +5568,6 @@
+@@ -6280,10 +6234,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross
@@ -89,8 +97,19 @@
-fi
mysql_cv_btype_last_arg_accept=none
cat > conftest.$ac_ext <<EOF
- #line 5625 "configure"
-@@ -7655,10 +7604,6 @@
+ #line 6290 "configure"
+@@ -8290,10 +8240,6 @@
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+
+-if test "$ac_cv_prog_gxx" = "yes"
+-then
+- CXXFLAGS="$CXXFLAGS -Werror"
+-fi
+ cat > conftest.$ac_ext <<EOF
+ #line 8299 "configure"
+ #include "confdefs.h"
+@@ -8358,10 +8304,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross
@@ -99,9 +118,9 @@
- CXXFLAGS="$CXXFLAGS -Werror"
-fi
cat > conftest.$ac_ext <<EOF
- #line 7664 "configure"
+ #line 8367 "configure"
#include "confdefs.h"
-@@ -7721,10 +7666,6 @@
+@@ -8425,10 +8367,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross
@@ -110,9 +129,9 @@
- CXXFLAGS="$CXXFLAGS -Werror"
-fi
cat > conftest.$ac_ext <<EOF
- #line 7730 "configure"
+ #line 8434 "configure"
#include "confdefs.h"
-@@ -8005,7 +7946,7 @@
+@@ -8712,7 +8650,7 @@
#include <pthread.h>
int main() {
pthread_attr_t thr_attr;
@@ -120,8 +139,8 @@
+XXXpthread_attr_setscope(&thr_attr,0);
; return 0; }
EOF
- if { (eval echo configure:8012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -8210,7 +8151,7 @@
+ if { (eval echo configure:8719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -9670,7 +9608,7 @@
echo ""
echo "Configuring MIT Pthreads"
# We will never install so installation paths are not needed.