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

(-)Makefile (-3 / +4 lines)
Lines 104-109 Link Here
104
APU_EXTRAS=	yes
104
APU_EXTRAS=	yes
105
PLIST_SUB+=	BDB=""
105
PLIST_SUB+=	BDB=""
106
USE_BDB=	42+
106
USE_BDB=	42+
107
INVALID_BDB_VER=	48 50
107
APU_CONF_ARGS+=	--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
108
APU_CONF_ARGS+=	--with-berkeley-db=${BDB_INCLUDE_DIR}:${BDB_LIB_DIR}
108
.if defined(PKGNAMESUFFIX)
109
.if defined(PKGNAMESUFFIX)
109
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
110
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
Lines 177-190 Link Here
177
APU_EXTRAS=	yes
178
APU_EXTRAS=	yes
178
PLIST_SUB+=	SQLITE3=""
179
PLIST_SUB+=	SQLITE3=""
179
USE_SQLITE=	YES
180
USE_SQLITE=	YES
180
CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE}
181
CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
181
.if defined(PKGNAMESUFFIX)
182
.if defined(PKGNAMESUFFIX)
182
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-sqlite3
183
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-sqlite3
183
.else
184
.else
184
PKGNAMESUFFIX=	-sqlite3
185
PKGNAMESUFFIX=	-sqlite3
185
.endif
186
.endif
186
.else
187
.else
187
CONFIGURE_ARGS+= --without-sqlite3
188
CONFIGURE_ARGS+=	--without-sqlite3
188
PLIST_SUB+=	SQLITE3="@comment "
189
PLIST_SUB+=	SQLITE3="@comment "
189
.endif
190
.endif
190
191
Lines 201-207 Link Here
201
		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
202
		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
202
	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
203
	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
203
		${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \
204
		${APR_WRKDIR}/build/apr_threads.m4 ${APR_WRKDIR}/build/apr_hints.m4 \
204
		${APU_WRKDIR}/build/apu-conf.m4 
205
		${APU_WRKDIR}/build/apu-conf.m4
205
206
206
run-autotools::
207
run-autotools::
207
	cd ${APR_WRKDIR} ; \
208
	cd ${APR_WRKDIR} ; \

Return to bug 145956