Author: wyoung
Date: Sat Mar 4 08:59:24 2006
New Revision: 1216
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1216&view=rev
Log:
Proper handling of thread support with autoconf target. Previous check
couldn't possibly work, because it depended on the configure script
running before bakefile, but it must be the other way around.
Modified:
branches/v2.1-bakefile/common.bkl
branches/v2.1-bakefile/examples/examples.bkl
branches/v2.1-bakefile/lib/lib.bkl
Modified: branches/v2.1-bakefile/common.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/branches/v2.1-bakefile/common.bkl?rev=1216&r1=1215&r2=1216&view=diff
==============================================================================
--- branches/v2.1-bakefile/common.bkl (original)
+++ branches/v2.1-bakefile/common.bkl Sat Mar 4 08:59:24 2006
@@ -3,13 +3,9 @@
<include file="presets/simple.bkl"/>
<set var="DBLDOLLAR">$(DOLLAR)$(DOLLAR)</set>
- <set var="MYSQLLIB">@MYSQL_C_LIB@</set>
<set var="ZLIB">yes</set>
<set var="THREAD_TYPE">single</set>
- <if cond="MYSQLLIB=='mysqlclient_r'">
- <set var="THREAD_TYPE">multi</set>
- </if>
<if cond="FORMAT in ['msvc6prj', 'mingw']">
<set var="THREAD_TYPE">multi</set>
</if>
Modified: branches/v2.1-bakefile/examples/examples.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/branches/v2.1-bakefile/examples/examples.bkl?rev=1216&r1=1215&r2=1216&view=diff
==============================================================================
--- branches/v2.1-bakefile/examples/examples.bkl (original)
+++ branches/v2.1-bakefile/examples/examples.bkl Sat Mar 4 08:59:24 2006
@@ -20,9 +20,12 @@
</if>
<if cond="FORMAT=='autoconf'">
+ <cxxflags>@PTHREAD_CFLAGS@</cxxflags>
+ <ldflags>@PTHREAD_LIBS@</ldflags>
+ <sys-lib>@MYSQL_C_LIB@</sys-lib>
+
<warnings>max</warnings>
<ldlibs>../lib/libmysqlpp.$(SO_SUFFIX)</ldlibs>
- <sys-lib>@MYSQL_C_LIB@</sys-lib>
<if cond="ZLIB=='yes'">
<sys-lib>z</sys-lib>
</if>
Modified: branches/v2.1-bakefile/lib/lib.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/branches/v2.1-bakefile/lib/lib.bkl?rev=1216&r1=1215&r2=1216&view=diff
==============================================================================
--- branches/v2.1-bakefile/lib/lib.bkl (original)
+++ branches/v2.1-bakefile/lib/lib.bkl Sat Mar 4 08:59:24 2006
@@ -31,6 +31,8 @@
<install-to>$(LIBDIR)</install-to>
<if cond="FORMAT=='autoconf'">
+ <cxxflags>@PTHREAD_CFLAGS@</cxxflags>
+ <ldflags>@PTHREAD_LIBS@</ldflags>
<sys-lib>@MYSQL_C_LIB@</sys-lib>
<modify-target target="uninstall">
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
