Attachment #120479 for bug #168177

Lines 5539-5545 Link Here

(-)TeX.orig/texk/kpathsea/configure (-1 / +5 lines)
5539	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"	5539	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
5540		5540
5541	# Always use our own libtool.	5541	# Always use our own libtool.
5542	LIBTOOL='$(SHELL) $(top_builddir)/libtool'	5542	if [ "${USERLAND}" = "Darwin" ]; then
		5543	LIBTOOL='glibtool'
		5544	else
		5545	LIBTOOL='libtool'
		5546	fi
5543		5547
5544	# Prevent multiple expansion	5548	# Prevent multiple expansion
5545		5549

Lines 31-37 Link Here

(-)TeX.orig/texk/libtool.m4 (-1 / +7 lines)
31	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"	31	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
32		32
33	# Always use our own libtool.	33	# Always use our own libtool.
34	LIBTOOL='$(SHELL) $(top_builddir)/libtool'	34	# Use the system libtool
		35	if [ "${USERLAND}" = "Darwin" ]; then
		36	LIBTOOL='glibtool'
		37	else
		38	LIBTOOL='libtool'
		39	fi
		40
35	AC_SUBST(LIBTOOL)dnl	41	AC_SUBST(LIBTOOL)dnl
36		42
37	# Prevent multiple expansion	43	# Prevent multiple expansion

Lines 12-18 Link Here

(-)TeX.orig/texk/make/common.mk (-1 / +5 lines)
12	LDFLAGS = @LDFLAGS@ $(XLDFLAGS)	12	LDFLAGS = @LDFLAGS@ $(XLDFLAGS)
13		13
14	# Kpathsea needs this for compiling, programs need it for linking.	14	# Kpathsea needs this for compiling, programs need it for linking.
15	LIBTOOL = $(SHELL) $(kpathsea_parent)/libtool	15	ifeq ($(USERLAND),Darwin)
		16	LIBTOOL='glibtool'
		17	else
		18	LIBTOOL='libtool'
		19	endif
16		20
17	# You can change [X]CPPFLAGS, [X]CFLAGS, or [X]DEFS, but	21	# You can change [X]CPPFLAGS, [X]CFLAGS, or [X]DEFS, but
18	# please don't change ALL_CPPFLAGS or ALL_CFLAGS.	22	# please don't change ALL_CPPFLAGS or ALL_CFLAGS.

Return to bug 168177