зеркало из https://github.com/mozilla/gecko-dev.git
Use @GLIB_CONFIG@ and @LIBIDL_CONFIG@ autoconf variables to find glib-config and libIDL config, rather than hardcoding thier names.
Thanks to Greg Roelofs for this fix.
This commit is contained in:
Родитель
3678eb9c97
Коммит
201a325a36
|
@ -36,14 +36,14 @@ CSRCS = \
|
|||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
# XXX replace with proper configure test for glib
|
||||
CFLAGS += $(shell glib-config --cflags) $(shell libIDL-config --cflags)
|
||||
CFLAGS += $(shell @GLIB_CONFIG@ --cflags) $(shell @LIBIDL_CONFIG@ --cflags)
|
||||
|
||||
# seperate out to get dependancies right
|
||||
LIBXPT=$(DIST)/lib/libxpt.a
|
||||
|
||||
# XXX need configure test
|
||||
EX_LIBS = -lIDL -L$(DIST)/bin $(LIBXPT) $(shell glib-config --libs) \
|
||||
$(shell libIDL-config --libs)
|
||||
EX_LIBS = -lIDL -L$(DIST)/bin $(LIBXPT) $(shell @GLIB_CONFIG@ --libs) \
|
||||
$(shell @LIBIDL_CONFIG@ --libs)
|
||||
|
||||
PROGS = $(OBJDIR)/xpidl
|
||||
|
||||
|
|
|
@ -36,14 +36,14 @@ CSRCS = \
|
|||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
# XXX replace with proper configure test for glib
|
||||
CFLAGS += $(shell glib-config --cflags) $(shell libIDL-config --cflags)
|
||||
CFLAGS += $(shell @GLIB_CONFIG@ --cflags) $(shell @LIBIDL_CONFIG@ --cflags)
|
||||
|
||||
# seperate out to get dependancies right
|
||||
LIBXPT=$(DIST)/lib/libxpt.a
|
||||
|
||||
# XXX need configure test
|
||||
EX_LIBS = -lIDL -L$(DIST)/bin $(LIBXPT) $(shell glib-config --libs) \
|
||||
$(shell libIDL-config --libs)
|
||||
EX_LIBS = -lIDL -L$(DIST)/bin $(LIBXPT) $(shell @GLIB_CONFIG@ --libs) \
|
||||
$(shell @LIBIDL_CONFIG@ --libs)
|
||||
|
||||
PROGS = $(OBJDIR)/xpidl
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче