Attachment #202787 for bug #255773

Lines 126-131 AC_SUBST(GTK_LIBS) Link Here

(-)a/configure.ac (+6 lines)
126	GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`	126	GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
127	AC_SUBST(GTK_VERSION)	127	AC_SUBST(GTK_VERSION)
128		128
		129	PKG_CHECK_MODULES(LUA, lua,,
		130	AC_MSG_ERROR([lua is required to compile gtk-engines]))
		131
		132	AC_SUBST(LUA_CFLAGS)
		133	AC_SUBST(LUA_LIBS)
		134
129	AC_SUBST(BUILD_ENGINES)	135	AC_SUBST(BUILD_ENGINES)
130	AC_SUBST(BUILD_THEMES)	136	AC_SUBST(BUILD_THEMES)
131	AC_SUBST(BUILD_SCHEMAS)	137	AC_SUBST(BUILD_SCHEMAS)





INCLUDES = \
	-I$(top_srcdir)/engines/support \
	$(GTK_CFLAGS) $(LUA_CFLAGS) $(DEVELOPMENT_CFLAGS) \
	$(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) \
	$(NULL)

enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines

	./src/main.c \
	./src/misc_utils.c \
	./src/misc_utils.h \
	./src/liblua/lapi.h \
	./src/liblua/lauxlib.h \
	./src/liblua/lcode.h \
	./src/liblua/ldebug.h \
	./src/liblua/ldo.h \
	./src/liblua/lfunc.h \
	./src/liblua/lgc.h \
	./src/liblua/llex.h \
	./src/liblua/llimits.h \
	./src/liblua/lmem.h \
	./src/liblua/lobject.h \
	./src/liblua/lopcodes.h \
	./src/liblua/lparser.h \
	./src/liblua/lstate.h \
	./src/liblua/lstring.h \
	./src/liblua/ltable.h \
	./src/liblua/ltm.h \
	./src/liblua/lua.h \
	./src/liblua/luaconf.h \
	./src/liblua/lualib.h \
	./src/liblua/lundump.h \
	./src/liblua/lvm.h \
	./src/liblua/lzio.h \
	./src/liblua/lapi.c \
	./src/liblua/lcode.c \
	./src/liblua/ldebug.c \
	./src/liblua/ldo.c \
	./src/liblua/ldump.c \
	./src/liblua/lfunc.c \
	./src/liblua/lgc.c \
	./src/liblua/liolib.c \
	./src/liblua/llex.c \
	./src/liblua/lmem.c \
	./src/liblua/lobject.c \
	./src/liblua/lopcodes.c \
	./src/liblua/loslib.c \
	./src/liblua/lparser.c \
	./src/liblua/lstate.c \
	./src/liblua/lstring.c \
	./src/liblua/lstrlib.c \
	./src/liblua/ltable.c \
	./src/liblua/ltablib.c \
	./src/liblua/ltm.c \
	./src/liblua/lundump.c \
	./src/liblua/lvm.c \
	./src/liblua/lzio.c \
	./src/liblua/lauxlib.c \
	./src/liblua/lbaselib.c \
	./src/liblua/ldblib.c \
	./src/liblua/lmathlib.c \
	./src/liblua/loadlib.c \
	./src/liblua/linit.c \
	$(NULL)

libluaengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LUA_LIBS)

-include $(top_srcdir)/git.mk


Return to bug 255773

Lines 23-30 NULL = Link Here

(-)a/engines/lua/Makefile.am (-55 / +2 lines)
23		23
24	INCLUDES = \	24	INCLUDES = \
25	-I$(top_srcdir)/engines/support \	25	-I$(top_srcdir)/engines/support \
26	-I$(top_srcdir)/engines/lua/src/liblua \	26	$(GTK_CFLAGS) $(LUA_CFLAGS) $(DEVELOPMENT_CFLAGS) \
27	$(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) \
28	$(NULL)	27	$(NULL)
29		28
30	enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines	29	enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
Lines 44-105 libluaengine_la_SOURCES = \ Link Here
44	./src/main.c \	43	./src/main.c \
45	./src/misc_utils.c \	44	./src/misc_utils.c \
46	./src/misc_utils.h \	45	./src/misc_utils.h \
47	./src/liblua/lapi.h \
48	./src/liblua/lauxlib.h \
49	./src/liblua/lcode.h \
50	./src/liblua/ldebug.h \
51	./src/liblua/ldo.h \
52	./src/liblua/lfunc.h \
53	./src/liblua/lgc.h \
54	./src/liblua/llex.h \
55	./src/liblua/llimits.h \
56	./src/liblua/lmem.h \
57	./src/liblua/lobject.h \
58	./src/liblua/lopcodes.h \
59	./src/liblua/lparser.h \
60	./src/liblua/lstate.h \
61	./src/liblua/lstring.h \
62	./src/liblua/ltable.h \
63	./src/liblua/ltm.h \
64	./src/liblua/lua.h \
65	./src/liblua/luaconf.h \
66	./src/liblua/lualib.h \
67	./src/liblua/lundump.h \
68	./src/liblua/lvm.h \
69	./src/liblua/lzio.h \
70	./src/liblua/lapi.c \
71	./src/liblua/lcode.c \
72	./src/liblua/ldebug.c \
73	./src/liblua/ldo.c \
74	./src/liblua/ldump.c \
75	./src/liblua/lfunc.c \
76	./src/liblua/lgc.c \
77	./src/liblua/liolib.c \
78	./src/liblua/llex.c \
79	./src/liblua/lmem.c \
80	./src/liblua/lobject.c \
81	./src/liblua/lopcodes.c \
82	./src/liblua/loslib.c \
83	./src/liblua/lparser.c \
84	./src/liblua/lstate.c \
85	./src/liblua/lstring.c \
86	./src/liblua/lstrlib.c \
87	./src/liblua/ltable.c \
88	./src/liblua/ltablib.c \
89	./src/liblua/ltm.c \
90	./src/liblua/lundump.c \
91	./src/liblua/lvm.c \
92	./src/liblua/lzio.c \
93	./src/liblua/lauxlib.c \
94	./src/liblua/lbaselib.c \
95	./src/liblua/ldblib.c \
96	./src/liblua/lmathlib.c \
97	./src/liblua/loadlib.c \
98	./src/liblua/linit.c \
99	$(NULL)	46	$(NULL)
100		47
101	libluaengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols	48	libluaengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
102	libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)	49	libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LUA_LIBS)
103		50
104	-include $(top_srcdir)/git.mk	51	-include $(top_srcdir)/git.mk
105		52