Looks good to me in general, but I have 0 knowledge on libtool, though.


 - Hubert

On Mon, 6 Dec 1999, Kazuki Sakamoto wrote:

> The following patch for bsd.pkg.mk reduce work of patch making for LIBTOOL.
> use USE_LIBTOOL_SYMLINK=yes instead of these patch.
> 
> 	+if false; then
> 	 # Always use our own libtool.
> 	 LIBTOOL='$(top_builddir)/libtool'
> 	...
> 	 $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
> 	 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
> 	+fi
> 
> pkg Makefile:
> 
> 	USE_LIBTOOL=	yes
> 	USE_LIBTOOL_SYMLINK=yes
> 	GNU_CONFIGURE=	yes
> 
> Can I commit it?
> 
> sakamoto
> ---
> --- bsd.pkg.mk	Mon Dec  6 13:27:43 1999
> +++ /tmp/bsd.pkg.mk	Mon Dec  6 13:32:08 1999
> @@ -1167,6 +1167,12 @@
>  	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
>  	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
>  	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
> +.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) && defined(USE_LIBTOOL_SYMLINK)
> +	if [ -f ${WRKSRC}/libtool ]; then \
> +		${RM} -f ${WRKSRC}/libtool;
> +		${LN} -s ${LIBTOOL} ${WRKSRC}/libtool
> +	fi
> +.endif
>  .endif
>  .if defined(USE_IMAKE)
>  	${_PKG_SILENT}(${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} ${XMKMF})
> 

-- 
NetBSD - Better for your uptime than Viagra