summaryrefslogtreecommitdiff
path: root/x11/qt4-libs/Makefile.common
diff options
context:
space:
mode:
authorjoerg <joerg>2007-01-15 19:16:36 +0000
committerjoerg <joerg>2007-01-15 19:16:36 +0000
commitc7b351215a8a16808ec918b148104ec5da31d15b (patch)
tree70d45ccad637e158c6ad92357b055ca635083651 /x11/qt4-libs/Makefile.common
parent306be3ea6157bb2e74b444e5e43aa281180dae10 (diff)
downloadpkgsrc-c7b351215a8a16808ec918b148104ec5da31d15b.tar.gz
Modular Xorg support.
Diffstat (limited to 'x11/qt4-libs/Makefile.common')
-rw-r--r--x11/qt4-libs/Makefile.common8
1 files changed, 4 insertions, 4 deletions
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index 6f948d90ee0..031dc88c535 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2006/05/31 19:18:07 adam Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/01/15 19:16:36 joerg Exp $
DISTNAME= qt-x11-opensource-src-${QTVERSION}
CATEGORIES= x11
@@ -69,7 +69,9 @@ LDFLAGS+= -lresolv
QMAKE_RANLIB?= ${TRUE}
-.if !exists(${X11BASE}/lib/libXinerama.so) && \
+.if ${X11_TYPE} != "native"
+.include "../../x11/libXinerama/buildlink3.mk"
+.elif !exists(${X11BASE}/lib/libXinerama.so) && \
!exists(${X11BASE}/lib/libXinerama.dylib)
CONFIGURE_ARGS+= -no-xinerama
.endif
@@ -84,8 +86,6 @@ CONFIGURE_ARGS+= -no-xinerama
CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline
.endif
-.include "../../mk/x11.buildlink3.mk"
-
pre-configure:
${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \
-e 's:@X11BASE@:${X11BASE}:g' \