Attachment #186804 for bug #263897

Lines 28-33 Link Here

(-)configure.ac (+16 lines)
28	dnl	28	dnl
29	dnl	29	dnl
30	AC_INIT(libXt, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt)	30	AC_INIT(libXt, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt)
		31
		32	AC_CANONICAL_BUILD
		33	AC_CANONICAL_HOST
		34
31	AM_INIT_AUTOMAKE([dist-bzip2])	35	AM_INIT_AUTOMAKE([dist-bzip2])
32	AM_MAINTAINER_MODE	36	AM_MAINTAINER_MODE
33		37
Lines 37-42 Link Here
37	AC_PROG_CC	41	AC_PROG_CC
38	AC_PROG_LIBTOOL	42	AC_PROG_LIBTOOL
39		43
		44	AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
		45
		46	if test "x${CC_FOR_BUILD+set}" != "xset" ; then
		47	if test "x$cross_compiling" = "xyes" ; then
		48	CC_FOR_BUILD=gcc
		49	else
		50	CC_FOR_BUILD=$CC
		51	fi
		52	fi
		53	AC_MSG_RESULT([$CC_FOR_BUILD])
		54	AC_SUBST(CC_FOR_BUILD)
		55
40	PKG_CHECK_MODULES(XT, sm x11 xproto kbproto)	56	PKG_CHECK_MODULES(XT, sm x11 xproto kbproto)
41		57
42	# Needed for including Xalloca.h	58	# Needed for including Xalloca.h




if INSTALL_MAKESTRS
bin_PROGRAMS = makestrs
noinst_PROGRAMS = $(MAKESTRS_PROG)
else
noinst_PROGRAMS = makestrs
noinst_PROGRAMS += $(MAKESTRS_PROG)
endif

EXTRA_DIST = \


.man.$(APP_MAN_SUFFIX):
	sed $(MAN_SUBSTS) < $< > $@

if CROSS_COMPILING
MAKESTRS_PROG=xmakestrs$(EXEEXT)

xmakestrs$(EXEEXT): makestrs.c
	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
endif





STRING_LIST = $(top_srcdir)/util/string.list

if CROSS_COMPILING
MAKESTRS=$(top_builddir)/util/xmakestrs
else
MAKESTRS=$(top_builddir)/util/makestrs
endif


all-local: $(BUILT_FILES)

$(BUILT_HEADER): $(BUILT_SOURCE)

$(BUILT_SOURCE):
	$(MAKESTRS) -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
	mkdir -p $(top_builddir)/src
	mkdir -p $(top_builddir)/include/X11
	cp StringDefs.h $(top_builddir)/include/X11

Return to bug 263897

Lines 92-103 Link Here

(-)src/Makefile.am (-1 / +8 lines)
92		92
93	STRING_LIST = $(top_srcdir)/util/string.list	93	STRING_LIST = $(top_srcdir)/util/string.list
94		94
		95	if CROSS_COMPILING
		96	MAKESTRS=$(top_builddir)/util/xmakestrs
		97	else
		98	MAKESTRS=$(top_builddir)/util/makestrs
		99	endif
		100
		101
95	all-local: $(BUILT_FILES)	102	all-local: $(BUILT_FILES)
96		103
97	$(BUILT_HEADER): $(BUILT_SOURCE)	104	$(BUILT_HEADER): $(BUILT_SOURCE)
98		105
99	$(BUILT_SOURCE):	106	$(BUILT_SOURCE):
100	$(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c	107	$(MAKESTRS) -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
101	mkdir -p $(top_builddir)/src	108	mkdir -p $(top_builddir)/src
102	mkdir -p $(top_builddir)/include/X11	109	mkdir -p $(top_builddir)/include/X11
103	cp StringDefs.h $(top_builddir)/include/X11	110	cp StringDefs.h $(top_builddir)/include/X11

Lines 1-7 Link Here

(-)util/Makefile.am (-1 / +11 lines)
1	if INSTALL_MAKESTRS	1	if INSTALL_MAKESTRS
2	bin_PROGRAMS = makestrs	2	bin_PROGRAMS = makestrs
		3	noinst_PROGRAMS = $(MAKESTRS_PROG)
3	else	4	else
4	noinst_PROGRAMS = makestrs	5	noinst_PROGRAMS = makestrs
		6	noinst_PROGRAMS += $(MAKESTRS_PROG)
5	endif	7	endif
6		8
7	EXTRA_DIST = \	9	EXTRA_DIST = \
Lines 41-43 Link Here
41		42
42	.man.$(APP_MAN_SUFFIX):	43	.man.$(APP_MAN_SUFFIX):
43	sed $(MAN_SUBSTS) < $< > $@	44	sed $(MAN_SUBSTS) < $< > $@
		45
		46	if CROSS_COMPILING
		47	MAKESTRS_PROG=xmakestrs$(EXEEXT)
		48
		49	xmakestrs$(EXEEXT): makestrs.c
		50	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
		51	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
		52	endif