Author: mysqlpp
Date: Mon Jul 21 08:54:53 2008
New Revision: 2306
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2306&view=rev
Log:
Solaris 10 build fixes:
- Doing synch.h test only if --enable-thread-check. Otherwise, we try
to build thread stuff on systems that have synch.h, even when it isn't
wanted.
- In checking for mutex support, checking for pthreads before old
synch.h method to account for systems where both exist. We prefer
pthreads.
Modified:
trunk/configure.ac
trunk/lib/beemutex.cpp
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/configure.ac?rev=2306&r1=2305&r2=2306&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Jul 21 08:54:53 2008
@@ -48,13 +48,13 @@
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
+ AC_CHECK_HEADERS(synch.h)
fi
# Checks for libraries and local system features
AC_CHECK_HEADERS(zlib.h, AC_CHECK_LIB(z, gzread, [],
[ AC_MSG_ERROR([zlib is required]) ]))
-AC_CHECK_HEADERS(synch.h)
LIB_MATH
LIB_SOCKET_NSL
MYSQL_API_LOCATION
Modified: trunk/lib/beemutex.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/beemutex.cpp?rev=2306&r1=2305&r2=2306&view=diff
==============================================================================
--- trunk/lib/beemutex.cpp (original)
+++ trunk/lib/beemutex.cpp Mon Jul 21 08:54:53 2008
@@ -39,10 +39,11 @@
namespace mysqlpp {
#define ACTUALLY_DOES_SOMETHING
-#if defined(HAVE_SYNCH_H)
+#if defined(HAVE_PTHREAD)
+ typedef pthread_mutex_t bc_mutex_t;
+#elif defined(HAVE_SYNCH_H)
+# include <synch.h>
typedef mutex_t bc_mutex_t;
-#elif defined(HAVE_PTHREAD)
- typedef pthread_mutex_t bc_mutex_t;
#elif defined(MYSQLPP_PLATFORM_WINDOWS)
typedef HANDLE bc_mutex_t;
#else
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
