--- /home/u1/pwrk/ports/Mk/bsd.autotools.mk	2011-02-25 20:44:30.000000000 -0500
+++ bsd.autotools.mk	2011-02-25 21:35:45.000000000 -0500
@@ -257,7 +257,7 @@
 #---------------------------------------------------------------------------
 
 .if defined(_AUTOTOOL_libltdl)
-LIB_DEPENDS+=		ltdl.7:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS+=		ltdl.7:${PORTSDIR}/local/libltdl
 .endif
 
 #---------------------------------------------------------------------------
@@ -266,7 +266,11 @@
 
 .if defined(_AUTOTOOL_libtool) || defined(_AUTOTOOL_libtoolize)
 LIBTOOL_VERSION=	2.4
-LIBTOOL_PORT=		devel/libtool
+. if defined(_USE_GCC) 
+LIBTOOL_PORT=		local/libtool-${CC}
+. else
+LIBTOOL_PORT=		local/libtool
+. endif
 
 . if defined(_AUTOTOOL_libtool) && ${_AUTOTOOL_libtool} == "yes"
 _AUTOTOOL_rule_libtool=		yes
@@ -280,12 +284,21 @@
 .endif
 
 .if defined(LIBTOOL_VERSION)
+. if defined(_USE_GCC)
+LIBTOOL=			${LOCALBASE}/bin/libtool-${CC}
+LIBTOOLIZE=			${LOCALBASE}/bin/libtoolize-${CC}
+LIBTOOL_LIBEXECDIR=	${LOCALBASE}/libexec/libtool-${CC}/libtool
+LIBTOOL_SHAREDIR=	${LOCALBASE}/share/libtool-${CC}/libtool
+LIBTOOL_M4=			${LOCALBASE}/share/libtool-${CC}/aclocal/libtool.m4
+LTMAIN=				${LOCALBASE}/share/libtool-${CC}/libtool/config/ltmain.sh
+. else
 LIBTOOL=			${LOCALBASE}/bin/libtool
 LIBTOOLIZE=			${LOCALBASE}/bin/libtoolize
 LIBTOOL_LIBEXECDIR=	${LOCALBASE}/libexec/libtool
 LIBTOOL_SHAREDIR=	${LOCALBASE}/share/libtool
 LIBTOOL_M4=			${LOCALBASE}/share/aclocal/libtool.m4
 LTMAIN=				${LOCALBASE}/share/libtool/config/ltmain.sh
+. endif
 
 LIBTOOL_VARS=		LIBTOOL=${LIBTOOL} \
 					LIBTOOLIZE=${LIBTOOLIZE} \