diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/unixodbc/Makefile.common | 12 | ||||
| -rw-r--r-- | databases/unixodbc/buildlink.mk | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common index 49c41c99fca..bc9992f52c3 100644 --- a/databases/unixodbc/Makefile.common +++ b/databases/unixodbc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2001/12/04 15:55:47 jlam Exp $ +# $NetBSD: Makefile.common,v 1.6 2002/08/01 06:40:52 jlam Exp $ DISTNAME= unixODBC-${ODBC_DIST_VERS} CATEGORIES= databases @@ -21,8 +21,7 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --enable-threads -CONFIGURE_ARGS+= --enable-gnuthreads -CONFIGURE_ARGS+= --with-pth=${BUILDLINK_DIR} +PTHREAD_OPTS+= require # Override the local definitions that point to the self-contained libtool # convenience library. We want the one installed by pkgsrc. Also override @@ -59,4 +58,9 @@ fix-ltdl-and-lexlib: done .include "../../devel/libtool/buildlink.mk" -.include "../../devel/pth/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" + +.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") +CONFIGURE_ARGS+= --enable-gnuthreads +CONFIGURE_ARGS+= --with-pth=${BUILDLINK_DIR} +.endif diff --git a/databases/unixodbc/buildlink.mk b/databases/unixodbc/buildlink.mk index b1032cfecc6..1c383b3fb79 100644 --- a/databases/unixodbc/buildlink.mk +++ b/databases/unixodbc/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1.1.1 2001/11/06 04:08:34 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2002/08/01 06:40:52 jlam Exp $ # # This Makefile fragment is included by packages that use unixodbc. # @@ -37,8 +37,10 @@ BUILDLINK_FILES.unixodbc+= lib/libodbccr.* BUILDLINK_FILES.unixodbc+= lib/libodbcextras.* BUILDLINK_FILES.unixodbc+= lib/libodbcinst.* +PTHREAD_OPTS+= require + .include "../../devel/libtool/buildlink.mk" -.include "../../devel/pth/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" BUILDLINK_TARGETS.unixodbc= unixodbc-buildlink BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.unixodbc} |