From 8b50af498f11d5c4ae20ef03feccf0693d658f02 Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 17 Jun 2007 13:47:00 +0000 Subject: Don't or X11_TYPE and MOZILLA_USE_XFT, but the exists() condition. --- www/firefox/Makefile.common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/firefox') diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common index 97fbe0c9eda..d41cba6b265 100644 --- a/www/firefox/Makefile.common +++ b/www/firefox/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2007/06/15 16:35:41 joerg Exp $ +# $NetBSD: Makefile.common,v 1.21 2007/06/17 13:47:00 joerg Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -211,7 +211,7 @@ CONFIGURE_ARGS+= --without-pthreads CONFIGURE_ARGS+= --with-pthreads .endif -.if (${MOZILLA_USE_XFT} == "YES" && exists(${X11BASE}/include/X11/Xdefs.h)) || ${X11_TYPE} != "native" +.if ${MOZILLA_USE_XFT} == "YES" && (exists(${X11BASE}/include/X11/Xdefs.h) || ${X11_TYPE} != "native") CONFIGURE_ARGS+= --enable-xft # pkgconfig defaults to a "build" dependency, which is what we want. .include "../../x11/libXft/buildlink3.mk" -- cgit v1.2.3