MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:kent.boortz Date:November 27 2008 11:47am
Subject:bzr commit into mysql-4.1 branch (kent.boortz:2706)
View as plain text  
#At file:///net/helheim/store/bteam/bzr/mysql-4.1.25-release/

 2706 kent.boortz@stripped	2008-11-27
      Back merges of sh compatility changes, to be able to do
      a bootstrap using Solaris "sh"
modified:
  BUILD/compile-dist
  configure.in

=== modified file 'BUILD/compile-dist'
--- a/BUILD/compile-dist	2006-06-17 13:37:23 +0000
+++ b/BUILD/compile-dist	2008-11-27 11:46:36 +0000
@@ -17,31 +17,47 @@ autoconf
 
 # Default to gcc for CC and CXX
 if test -z "$CXX" ; then
-  export CXX=gcc
+  CXX=gcc
   # Set some required compile options
   if test -z "$CXXFLAGS" ; then
-    export CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"
+    CXXFLAGS="-felide-constructors -fno-exceptions -fno-rtti"
   fi
 fi
 
 if test -z "$CC" ; then
-  export CC=gcc
+  CC=gcc
 fi
 
 
 # Use ccache, if available
-if ccache -V > /dev/null 2>&1
-then
-  if ! (echo "$CC" | grep "ccache" > /dev/null)
+ if ccache -V > /dev/null 2>&1
+ then
+  if echo "$CC" | grep "ccache" > /dev/null
   then
-    export CC="ccache $CC"
+    :
+  else
+    CC="ccache $CC"
   fi
-  if ! (echo "$CXX" | grep "ccache" > /dev/null)
+  if echo "$CXX" | grep "ccache" > /dev/null
   then
-    export CXX="ccache $CXX"
+    :
+  else
+    CXX="ccache $CXX"
   fi
 fi
 
+if test -z "$MAKE"
+then
+  if gmake -v > /dev/null 2>&1
+  then
+    MAKE="gmake"
+  else
+    MAKE="make"
+  fi
+fi
+
+export CC CXX MAKE
+
 # Make sure to enable all features that affect "make dist"
 ./configure \
   --with-embedded-server \
@@ -50,4 +66,4 @@ fi
   --enable-thread-safe-client \
   --with-extra-charsets=complex \
   --with-ndbcluster
-make
+$MAKE

=== modified file 'configure.in'
--- a/configure.in	2008-03-19 17:44:21 +0000
+++ b/configure.in	2008-11-27 11:46:36 +0000
@@ -482,12 +482,15 @@ dnl Find paths to some shell programs
 AC_PATH_PROG(LN, ln, ln)
 # This must be able to take a -f flag like normal unix ln.
 AC_PATH_PROG(LN_CP_F, ln, ln)
-if ! ( expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null ); then
-# If ln -f does not exists use -s (AFS systems)
-if test -n "$LN_CP_F"; then
-  LN_CP_F="$LN_CP_F -s"
-fi
-fi
+case $SYSTEM_TYPE in
+  *netware*) ;;
+  *)
+    # If ln -f does not exists use -s (AFS systems)
+    if test -n "$LN_CP_F"; then
+      LN_CP_F="$LN_CP_F -s"
+    fi
+    ;;
+esac
 
 AC_PATH_PROG(MV, mv, mv)
 AC_PATH_PROG(RM, rm, rm)
@@ -1704,12 +1707,14 @@ else
   OPTIMIZE_CXXFLAGS="-O"
 fi
 
-if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then
-  DEBUG_CFLAGS="$DEBUG_CFLAGS -DDEBUG -sym internal,codeview4"
-  DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -DDEBUG -sym internal,codeview4"
-  OPTIMIZE_CFLAGS="$OPTIMIZE_CFLAGS -DNDEBUG"
-  OPTIMIZE_CXXFLAGS="$OPTIMIZE_CXXFLAGS -DNDEBUG"
-fi
+case $SYSTEM_TYPE in
+  *netware*)
+    DEBUG_CFLAGS="$DEBUG_CFLAGS -DDEBUG -sym internal,codeview4"
+    DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -DDEBUG -sym internal,codeview4"
+    OPTIMIZE_CFLAGS="$OPTIMIZE_CFLAGS -DNDEBUG"
+    OPTIMIZE_CXXFLAGS="$OPTIMIZE_CXXFLAGS -DNDEBUG"
+    ;;
+esac
 
 # If the user specified CFLAGS, we won't add any optimizations
 if test -n "$SAVE_CFLAGS"
@@ -1899,15 +1904,17 @@ MYSQL_CHECK_IN_ADDR_T
 # 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
+case $SYSTEM_TYPE in
+  *netware*) ;;
+  *)
+    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
+esac
 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])
@@ -2500,11 +2507,12 @@ readline_dir=""
 readline_h_ln_cmd=""
 readline_link=""
 
-if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null; then
+case $SYSTEM_TYPE in
+  *netware*)
     # For NetWare, do not need readline
     echo "Skipping readline"
-else
-
+    ;;
+  *)
 if [test "$with_libedit" = "yes"] || [test "$with_libedit" = "undefined"] && [test "$with_readline" = "undefined"]
 then
     readline_topdir="cmd-line-utils"
@@ -2545,7 +2553,8 @@ else
           versions of libedit or readline])
     fi
 fi
-fi
+    ;;
+esac
 
 AC_SUBST(readline_dir)
 AC_SUBST(readline_topdir)

Thread
bzr commit into mysql-4.1 branch (kent.boortz:2706) kent.boortz27 Nov