зеркало из https://github.com/mozilla/gecko-dev.git
Attempt to fix bustage when GConf/GnomeVFS libraries are not available (bug 251703). Always export the GNOME interfaces on gtk2 but only build the component when all of the prerequisites are installed. r+sr=darin.
This commit is contained in:
Родитель
d1e00151e6
Коммит
cccd3db6fd
|
@ -43,6 +43,18 @@ VPATH = @srcdir@
|
||||||
include $(DEPTH)/config/autoconf.mk
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
MODULE = mozgnome
|
MODULE = mozgnome
|
||||||
|
|
||||||
|
XPIDLSRCS = \
|
||||||
|
nsIGConfService.idl \
|
||||||
|
nsIGnomeVFSService.idl \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
|
||||||
|
# We always export these interfaces if we're building for gtk2, but
|
||||||
|
# only compile the component if the required libraries are available.
|
||||||
|
|
||||||
|
ifdef MOZ_ENABLE_GNOME_COMPONENT
|
||||||
|
|
||||||
LIBRARY_NAME = mozgnome
|
LIBRARY_NAME = mozgnome
|
||||||
FORCE_SHARED_LIB = 1
|
FORCE_SHARED_LIB = 1
|
||||||
IS_COMPONENT = 1
|
IS_COMPONENT = 1
|
||||||
|
@ -53,11 +65,6 @@ REQUIRES = \
|
||||||
necko \
|
necko \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
XPIDLSRCS = \
|
|
||||||
nsIGConfService.idl \
|
|
||||||
nsIGnomeVFSService.idl \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
CPPSRCS = \
|
CPPSRCS = \
|
||||||
nsGConfService.cpp \
|
nsGConfService.cpp \
|
||||||
nsGnomeVFSService.cpp \
|
nsGnomeVFSService.cpp \
|
||||||
|
@ -71,6 +78,8 @@ EXTRA_DSO_LDOPTS += \
|
||||||
$(MOZ_LIBGNOME_LIBS) \
|
$(MOZ_LIBGNOME_LIBS) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
CXXFLAGS += \
|
CXXFLAGS += \
|
||||||
|
|
Загрузка…
Ссылка в новой задаче