diff options
| author | gerberb@ou800.zenez.com <> | 2003-09-03 09:23:18 -0600 |
|---|---|---|
| committer | gerberb@ou800.zenez.com <> | 2003-09-03 09:23:18 -0600 |
| commit | b64d6a0310f1788e09c405222fc86d1303196054 (patch) | |
| tree | a5646326cd3d6cbdb089b7476ed38a65f475e39a | |
| parent | 5e6d8dd7fe5fd68a6e322fa4d83fe0d2ca39c6aa (diff) | |
| parent | 7005115e97b3986a7ec1ba59ff6ece82bcc1a2f2 (diff) | |
| download | mariadb-git-b64d6a0310f1788e09c405222fc86d1303196054.tar.gz | |
Merge bgerber@bk-internal.mysql.com:/home/bk/mysql-4.0
into ou800.zenez.com:/unixware/home/mount/ou800/zenez3/zenez/bk/blg/mysql-4.0
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | configure.in | 14 |
2 files changed, 13 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index ffc7baf242c..348ed8d24df 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -17,6 +17,7 @@ bk@admin.bk davida@isil.mysql.com dlenev@build.mysql.com dlenev@mysql.com +gerberb@ou800.zenez.com gluh@gluh.(none) gluh@gluh.mysql.r18.ru greg@gcw.ath.cx diff --git a/configure.in b/configure.in index f894cb5cb2a..0538199e8e1 100644 --- a/configure.in +++ b/configure.in @@ -1339,7 +1339,12 @@ then if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so then MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK - with_named_thread="-Kthread -lsocket -lnsl" + if expr "$CC" : ".*gcc.*" + then + with_named_thread="-pthread -lsocket -lnsl" + else + with_named_thread="-Kthread -lsocket -lnsl" + fi if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null then AC_DEFINE(HAVE_UNIXWARE7_THREADS) @@ -1375,7 +1380,12 @@ then if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so then MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK - with_named_thread="-Kthread -lsocket -lnsl" + if expr "$CC" : ".*gcc.*" + then + with_named_thread="-pthread -lsocket -lnsl" + else + with_named_thread="-Kthread -lsocket -lnsl" + fi if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null then AC_DEFINE(HAVE_UNIXWARE7_THREADS) |