Attachment #32597 for bug #53791

View | Details | Raw Unified | Return to bug 53791
Collapse All | Expand All




.if !defined (QT_NONSTANDARD)
CONFIGURE_ARGS+=--with-extra-libs="${LOCALBASE}/lib" \
				--with-extra-includes="${LOCALBASE}/include"
CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" \
				LIBS="${QTCFGLIBS}" QTDIR="${QT_CVS_PREFIX}" \
				KDEDIR="${KDE_CVS_PREFIX}"
.endif

.elif ${USE_QT_VER} == 3

CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
				--with-qt-libraries=${QT_PREFIX}/lib \
				--with-extra-libs=${LOCALBASE}/lib
CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" \
			    LIBS="${QTCFGLIBS}"
.endif # !defined(QT_NONSTANDARD)

.else # QT2

				--with-qt-libraries=${X11BASE}/lib \
				--with-extra-libs=${LOCALBASE}/lib
CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
				CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
.endif # !defined(QT_NONSTANDARD)

.endif # USE_QT_VER == ???

Return to bug 53791

Lines 110-117 Link Here

(-)bsd.kde.mk (-4 / +6 lines)
110	.if !defined (QT_NONSTANDARD)	110	.if !defined (QT_NONSTANDARD)
111	CONFIGURE_ARGS+=--with-extra-libs="${LOCALBASE}/lib" \	111	CONFIGURE_ARGS+=--with-extra-libs="${LOCALBASE}/lib" \
112	--with-extra-includes="${LOCALBASE}/include"	112	--with-extra-includes="${LOCALBASE}/include"
113	CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \	113	CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" \
114	QTDIR="${QT_CVS_PREFIX}" KDEDIR="${KDE_CVS_PREFIX}"	114	LIBS="${QTCFGLIBS}" QTDIR="${QT_CVS_PREFIX}" \
		115	KDEDIR="${KDE_CVS_PREFIX}"
115	.endif	116	.endif
116		117
117	.elif ${USE_QT_VER} == 3	118	.elif ${USE_QT_VER} == 3
Lines 139-145 Link Here
139	CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \	140	CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
140	--with-qt-libraries=${QT_PREFIX}/lib \	141	--with-qt-libraries=${QT_PREFIX}/lib \
141	--with-extra-libs=${LOCALBASE}/lib	142	--with-extra-libs=${LOCALBASE}/lib
142	CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"	143	CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" \
		144	LIBS="${QTCFGLIBS}"
143	.endif # !defined(QT_NONSTANDARD)	145	.endif # !defined(QT_NONSTANDARD)
144		146
145	.else # QT2	147	.else # QT2
Lines 159-165 Link Here
159	--with-qt-libraries=${X11BASE}/lib \	161	--with-qt-libraries=${X11BASE}/lib \
160	--with-extra-libs=${LOCALBASE}/lib	162	--with-extra-libs=${LOCALBASE}/lib
161	CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \	163	CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \
162	CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"	164	CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
163	.endif # !defined(QT_NONSTANDARD)	165	.endif # !defined(QT_NONSTANDARD)
164		166
165	.endif # USE_QT_VER == ???	167	.endif # USE_QT_VER == ???