Commit 3e52a3f1 authored by unknown's avatar unknown
Browse files

Portability fixes OpenUnix 8 & UnixWare 7.1.x

parent babb7ce9

acinclude.m4

+2 −1
Original line number Diff line number Diff line
@@ -1165,7 +1165,8 @@ m4_define([_AC_PROG_CXX_EXIT_DECLARATION], 
   'extern "C" void std::exit (int); using std::exit;' \

   'extern "C" void exit (int) throw ();' \

   'extern "C" void exit (int);' \

   'void exit (int);'

   'void exit (int);' \

   '#include <stdlib.h>'

do

  _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <stdlib.h>

$ac_declaration],

configure.in

+2 −6
Original line number Diff line number Diff line
@@ -1170,10 +1170,8 @@ then 
      with_named_thread="-Kthread -lsocket -lnsl"

      if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null

      then

#        AC_DEFINE(HAVE_OpenUNIX8_THREADS)

        AC_DEFINE(HAVE_UNIXWARE7_THREADS)

      else

#        AC_DEFINE(HAVE_OpenUNIX8_POSIX)

        AC_DEFINE(HAVE_UNIXWARE7_POSIX)

      fi

      # We must have cc
@@ -1182,10 +1180,8 @@ then 
      then

	{ echo "configure: error: On OpenUNIX8 and UnixWare7 MySQL must be compiled with cc. See the Installation chapter in the Reference Manual." 1>&2; exit 1; };

      else

#	CC="$CC -Kthread -DOpenUNIX8";

#	CXX="$CXX -Kthread -DOpenUNIX8";

	CC="$CC -Kthread -DUNIXWARE_7";

	CXX="$CXX -Kthread -DUNIXWARE_7";

 	CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";

 	CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";

      fi

      AC_MSG_RESULT("yes")

    else