Attachment #186384 for bug #263937




fi
AC_SUBST(XKBPROTO_REQUIRES)

AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])

AC_MSG_CHECKING([for CC_FOR_BUILD])
if test x$host != x$build ; then
    CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
else
    CC_FOR_BUILD=${CC}
fi
AC_MSG_RESULT([$CC_FOR_BUILD])
AC_SUBST(CC_FOR_BUILD)

AC_FUNC_MMAP()
composecache_default=$ac_cv_func_mmap_fixed_mapped
AC_CHECK_FUNC(nl_langinfo, , [composecache_default=no])

Lines 421-428 Link Here

(-)src/Makefile.am (-1 / +7 lines)
421		421
422	KEYSYMDEF=@KEYSYMDEF@	422	KEYSYMDEF=@KEYSYMDEF@
423		423
		424	if CROSS_COMPILING
		425	MAKEKEYS=$(top_builddir)/src/util/xmakekeys
		426	else
		427	MAKEKEYS=$(top_builddir)/src/util/makekeys
		428	endif
		429
424	ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)	430	ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
425	$(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h	431	$(MAKEKEYS) < $(KEYSYMDEF) > ks_tables_h
426	mv ks_tables_h $@	432	mv ks_tables_h $@
427		433
428	$(top_builddir)/src/util/makekeys$(EXEEXT): force	434	$(top_builddir)/src/util/makekeys$(EXEEXT): force




# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $

noinst_PROGRAMS=makekeys$(EXEEXT) $(MAKEKEYS_PROG)

makekeys_CFLAGS=$(X11_CFLAGS)

if CROSS_COMPILING
MAKEKEYS_PROG=xmakekeys$(EXEEXT)

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

EXTRA_DIST = mkks.sh


Return to bug 263937

Lines 305-310 Link Here

(-)configure.ac (+11 lines)
305	fi	305	fi
306	AC_SUBST(XKBPROTO_REQUIRES)	306	AC_SUBST(XKBPROTO_REQUIRES)
307		307
		308	AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
		309
		310	AC_MSG_CHECKING([for CC_FOR_BUILD])
		311	if test x$host != x$build ; then
		312	CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
		313	else
		314	CC_FOR_BUILD=${CC}
		315	fi
		316	AC_MSG_RESULT([$CC_FOR_BUILD])
		317	AC_SUBST(CC_FOR_BUILD)
		318
308	AC_FUNC_MMAP()	319	AC_FUNC_MMAP()
309	composecache_default=$ac_cv_func_mmap_fixed_mapped	320	composecache_default=$ac_cv_func_mmap_fixed_mapped
310	AC_CHECK_FUNC(nl_langinfo, , [composecache_default=no])	321	AC_CHECK_FUNC(nl_langinfo, , [composecache_default=no])

Lines 1-11 Link Here

(-)src/util/Makefile.am (-3 / +8 lines)
1	# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $	1	# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
2		2
3	noinst_PROGRAMS=makekeys	3	noinst_PROGRAMS=makekeys$(EXEEXT) $(MAKEKEYS_PROG)
4		4
5	makekeys_CFLAGS=$(X11_CFLAGS)	5	makekeys_CFLAGS=$(X11_CFLAGS)
6		6
7	#override CC = gcc	7	if CROSS_COMPILING
8	LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@	8	MAKEKEYS_PROG=xmakekeys$(EXEEXT)
		9
		10	xmakekeys$(EXEEXT): makekeys.c
		11	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
		12	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c
		13	endif
9		14
10	EXTRA_DIST = mkks.sh	15	EXTRA_DIST = mkks.sh
11		16