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

(-)bsd.autotools.mk (-2 / +6 lines)
Lines 122-128 Link Here
122
. endif
122
. endif
123
123
124
. if defined(AUTOTOOL_aclocal)
124
. if defined(AUTOTOOL_aclocal)
125
ACLOCAL_ARGS?=		--acdir=${ACLOCAL_DIR}
125
ACLOCAL_ARGS?=		--acdir=${ACLOCAL_DIR} ${ACLOCAL_INC}
126
. endif
126
. endif
127
127
128
.endif
128
.endif
Lines 198-204 Link Here
198
LIBTOOLIZE=			${LOCALBASE}/bin/libtoolize
198
LIBTOOLIZE=			${LOCALBASE}/bin/libtoolize
199
LIBTOOL_LIBEXECDIR=	${LOCALBASE}/libexec/libtool
199
LIBTOOL_LIBEXECDIR=	${LOCALBASE}/libexec/libtool
200
LIBTOOL_SHAREDIR=	${LOCALBASE}/share/libtool
200
LIBTOOL_SHAREDIR=	${LOCALBASE}/share/libtool
201
LIBTOOL_M4=			${LOCALBASE}/share/aclocal/libtool.m4
201
LIBTOOL_ACLOCALDIR=	${LOCALBASE}/share/aclocal
202
LIBTOOL_M4=			${LIBTOOL_ACLOCALDIR}/libtool.m4
202
LTMAIN=				${LIBTOOL_SHAREDIR}/ltmain.sh
203
LTMAIN=				${LIBTOOL_SHAREDIR}/ltmain.sh
203
LIBTOOL_VARS=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} LIBTOOL_M4=${LIBTOOL_M4}
204
LIBTOOL_VARS=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} LIBTOOL_M4=${LIBTOOL_M4}
204
205
Lines 206-211 Link Here
206
BUILD_DEPENDS+=		${LIBTOOL_DEPENDS}
207
BUILD_DEPENDS+=		${LIBTOOL_DEPENDS}
207
208
208
LIBTOOLFLAGS?=		# default to empty
209
LIBTOOLFLAGS?=		# default to empty
210
211
# Add libtool macros dir to the list of aclocal dirs
212
ACLOCAL_INC+=	-I ${LIBTOOL_ACLOCALDIR}
209
213
210
. if defined(AUTOTOOL_autoconf)
214
. if defined(AUTOTOOL_autoconf)
211
LIBTOOLFILES?=		aclocal.m4
215
LIBTOOLFILES?=		aclocal.m4

Return to bug 94043