List:Commits« Previous MessageNext Message »
From:msvensson Date:April 26 2006 10:17am
Subject:bk commit into 5.0 tree (msvensson:1.2189)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2189 06/04/26 12:16:57 msvensson@neptunus.(none) +1 -0
  Remove hacks for building shared libs on aix and qnx

  configure.in
    1.384 06/04/26 12:16:52 msvensson@neptunus.(none) +0 -39
    Remove hacks for building shared libs on aix and qnx

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.383/configure.in	2006-04-22 21:53:28 +02:00
+++ 1.384/configure.in	2006-04-26 12:16:52 +02:00
@@ -219,45 +219,6 @@
   AC_PATH_PROG(AS, as, as)
 fi
 
-# These checks has to be made befoe we buil libtool as they affect
-# what is written into libtool.
-case $SYSTEM_TYPE in
-    *aix5*)
-       # Find out which ABI we are using.
-      echo 'int i;' > conftest.$ac_ext
-      if AC_TRY_EVAL(ac_compile); then
-        case `/usr/bin/file conftest.$ac_objext` in
-        *"32-bit XCOFF"*)
-          # OBJECT_MODE=32
-          ;;
-         *"64-bit XCOFF"*)
-	   AC_MSG_WARN([Setting 64-bit mode for AIX 5.*])
-           # It was detected that compiler is using 64-bit mode
-	   # Set flags for CC and NM so that those tools will work
-           # in 64-bit mode when called from libtool
-	   # The easiest way fix this is "export OBJECT_MODE=64"
-	   CC="$CC -q64"
-	   CXX="$CXX -q64"
-	   if test "X${NM+set}" != Xset; then
-	     NM="/usr/bin/nm -B -X64"
-           fi
-          ;;
-	esac
-      fi
-      rm -rf conftest*
-    ;;
-    *qnx*)
-    # Don't build shared libraries on QNX as it will run out of
-    # stack and segfault
-    AC_MSG_WARN([Turning off building of shared libraries])
-    AC_DISABLE_SHARED
-    ;;
-    *)
-    ;;
-esac
-
-LINK= "OBJECT_MODE=64 $LINK"
-
 # Still need ranlib for readline; local static use only so no libtool.
 AC_PROG_RANLIB
 # We use libtool
Thread
bk commit into 5.0 tree (msvensson:1.2189)msvensson26 Apr