Commit 70686e25 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 03d17059 b0fc53f3

configure.in

+16 −16
Original line number Diff line number Diff line
@@ -1374,20 +1374,20 @@ then 
          AC_MSG_CHECKING("for gcc")

          if expr "$CC" : ".*gcc.*"

          then

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

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

	    CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

	    CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

          else

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

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

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

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

          fi

        else

          { AC_MSG_ERROR([configure: error: Can't find thread libs on SCO UnixWare7. See the Installation chapter in the Reference Manual.]) };

          AC_MSG_ERROR([configure: error: Can't find thread libs on SCO UnixWare7. See the Installation chapter in the Reference Manual.]) 

        fi

      else

        AC_MSG_RESULT("no")

      fi

    else

      AC_MSG_ERROR([On SCO UNIX MySQL requires that the FSUThreads package is installed. See the Installation chapter in the Reference Manual.]);

      AC_MSG_ERROR([On SCO UNIX MySQL requires that the FSUThreads package is installed. See the Installation chapter in the Reference Manual.])

    fi

  else

    AC_MSG_RESULT("no")
@@ -1419,15 +1419,15 @@ then 
      AC_MSG_CHECKING("for gcc")

      if expr "$CC" : ".*gcc.*"

      then

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

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

	CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

	CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

      else

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

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

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

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

      fi

      AC_MSG_RESULT("yes")

    else

      { AC_MSG_ERROR([configure: error: Can't find thread libs on SCO UnixWare7. See the Installation chapter in the Reference Manual.]) };

      AC_MSG_ERROR([configure: error: Can't find thread libs on SCO UnixWare7. See the Installation chapter in the Reference Manual.]) 

    fi

  else

    AC_MSG_RESULT("no")
@@ -1462,15 +1462,15 @@ then 
      AC_MSG_CHECKING("for gcc")

      if expr "$CC" : ".*gcc.*"

      then

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

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

	CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

	CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"

      else

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

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

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

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

      fi

      AC_MSG_RESULT("yes")

    else

      { AC_MSG_ERROR([configure: error: Can't find thread libs on Caldera OpenUNIX 8. See the Installation chapter in the Reference Manual.]) };

      AC_MSG_ERROR([configure: error: Can't find thread libs on Caldera OpenUNIX 8. See the Installation chapter in the Reference Manual.]) 

    fi

  else

    AC_MSG_RESULT("no")