mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 469558: --enable-system-lcms build option should be removed.r=vlad,sr=ted
This commit is contained in:
parent
f4b909ff36
commit
475a3a6720
@ -128,7 +128,6 @@ export::
|
|||||||
-DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \
|
-DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \
|
||||||
-DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
|
-DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
|
||||||
-DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \
|
-DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \
|
||||||
-DMOZ_NATIVE_LCMS=$(MOZ_NATIVE_LCMS) \
|
|
||||||
$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
|
$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
|
||||||
$(INSTALL) system_wrappers $(DIST)/include
|
$(INSTALL) system_wrappers $(DIST)/include
|
||||||
|
|
||||||
|
@ -441,14 +441,9 @@ PNG_LIBS = @MOZ_PNG_LIBS@
|
|||||||
PNG_REQUIRES = png
|
PNG_REQUIRES = png
|
||||||
endif
|
endif
|
||||||
|
|
||||||
MOZ_NATIVE_LCMS = @MOZ_NATIVE_LCMS@
|
|
||||||
LCMS_CFLAGS = @LCMS_CFLAGS@
|
LCMS_CFLAGS = @LCMS_CFLAGS@
|
||||||
LCMS_LIBS = @LCMS_LIBS@
|
LCMS_LIBS = @LCMS_LIBS@
|
||||||
ifdef MOZ_NATIVE_LCMS
|
|
||||||
LCMS_REQUIRES =
|
|
||||||
else
|
|
||||||
LCMS_REQUIRES = lcms
|
LCMS_REQUIRES = lcms
|
||||||
endif
|
|
||||||
|
|
||||||
MOZ_NATIVE_SQLITE = @MOZ_NATIVE_SQLITE@
|
MOZ_NATIVE_SQLITE = @MOZ_NATIVE_SQLITE@
|
||||||
SQLITE_CFLAGS = @SQLITE_CFLAGS@
|
SQLITE_CFLAGS = @SQLITE_CFLAGS@
|
||||||
|
@ -1014,18 +1014,6 @@ png.h
|
|||||||
#if MOZ_NATIVE_ZLIB==1
|
#if MOZ_NATIVE_ZLIB==1
|
||||||
zlib.h
|
zlib.h
|
||||||
#endif
|
#endif
|
||||||
#if MOZ_ENABLE_LIBXUL!=1
|
|
||||||
#if BUILD_STATIC_LIBS!=1
|
|
||||||
#define WRAP_LCMS_HEADERS
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#if MOZ_NATIVE_LCMS==1
|
|
||||||
#define WRAP_LCMS_HEADERS
|
|
||||||
#endif
|
|
||||||
#ifdef WRAP_LCMS_HEADERS
|
|
||||||
icc34.h
|
|
||||||
lcms.h
|
|
||||||
#endif
|
|
||||||
#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
|
#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
|
||||||
libsn/sn.h
|
libsn/sn.h
|
||||||
libsn/sn-common.h
|
libsn/sn-common.h
|
||||||
|
24
configure.in
24
configure.in
@ -7537,28 +7537,16 @@ dnl ========================================================
|
|||||||
dnl Check for lcms
|
dnl Check for lcms
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
|
|
||||||
MOZ_NATIVE_LCMS=
|
LCMS_CFLAGS=
|
||||||
MOZ_ARG_ENABLE_BOOL(system-lcms,
|
if test "$_WIN32_MSVC"; then
|
||||||
[ --enable-system-lcms Use system lcms (located with pkgconfig)],
|
if test -z "$BUILD_STATIC_LIBS" -a -z "$MOZ_ENABLE_LIBXUL"; then
|
||||||
MOZ_NATIVE_LCMS=1,
|
LCMS_CFLAGS=-DLCMS_DLL
|
||||||
MOZ_NATIVE_LCMS= )
|
|
||||||
|
|
||||||
if test -z "$MOZ_NATIVE_LCMS"
|
|
||||||
then
|
|
||||||
LCMS_CFLAGS=
|
|
||||||
if test "$_WIN32_MSVC"; then
|
|
||||||
if test -z "$BUILD_STATIC_LIBS" -a -z "$MOZ_ENABLE_LIBXUL"; then
|
|
||||||
LCMS_CFLAGS=-DLCMS_DLL
|
|
||||||
fi
|
|
||||||
LCMS_LIBS='$(LIBXUL_DIST)/lib/mozlcms.lib'
|
|
||||||
else
|
|
||||||
LCMS_LIBS='-L$(LIBXUL_DIST)/bin -lmozlcms'
|
|
||||||
fi
|
fi
|
||||||
|
LCMS_LIBS='$(LIBXUL_DIST)/lib/mozlcms.lib'
|
||||||
else
|
else
|
||||||
PKG_CHECK_MODULES(LCMS, lcms >= $LCMS_VERSION)
|
LCMS_LIBS='-L$(LIBXUL_DIST)/bin -lmozlcms'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(MOZ_NATIVE_LCMS)
|
|
||||||
AC_SUBST(LCMS_CFLAGS)
|
AC_SUBST(LCMS_CFLAGS)
|
||||||
AC_SUBST(LCMS_LIBS)
|
AC_SUBST(LCMS_LIBS)
|
||||||
|
|
||||||
|
@ -1014,18 +1014,6 @@ png.h
|
|||||||
#if MOZ_NATIVE_ZLIB==1
|
#if MOZ_NATIVE_ZLIB==1
|
||||||
zlib.h
|
zlib.h
|
||||||
#endif
|
#endif
|
||||||
#if MOZ_ENABLE_LIBXUL!=1
|
|
||||||
#if BUILD_STATIC_LIBS!=1
|
|
||||||
#define WRAP_LCMS_HEADERS
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#if MOZ_NATIVE_LCMS==1
|
|
||||||
#define WRAP_LCMS_HEADERS
|
|
||||||
#endif
|
|
||||||
#ifdef WRAP_LCMS_HEADERS
|
|
||||||
icc34.h
|
|
||||||
lcms.h
|
|
||||||
#endif
|
|
||||||
#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
|
#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
|
||||||
libsn/sn.h
|
libsn/sn.h
|
||||||
libsn/sn-common.h
|
libsn/sn-common.h
|
||||||
|
@ -757,6 +757,12 @@ MAKEFILES_libmar="
|
|||||||
modules/libmar/tool/Makefile
|
modules/libmar/tool/Makefile
|
||||||
"
|
"
|
||||||
|
|
||||||
|
MAKEFILES_lcms="
|
||||||
|
modules/lcms/Makefile
|
||||||
|
modules/lcms/include/Makefile
|
||||||
|
modules/lcms/src/Makefile
|
||||||
|
"
|
||||||
|
|
||||||
add_makefiles "
|
add_makefiles "
|
||||||
$MAKEFILES_db
|
$MAKEFILES_db
|
||||||
$MAKEFILES_dom
|
$MAKEFILES_dom
|
||||||
@ -799,6 +805,7 @@ add_makefiles "
|
|||||||
$MAKEFILES_accessible
|
$MAKEFILES_accessible
|
||||||
$MAKEFILES_zlib
|
$MAKEFILES_zlib
|
||||||
$MAKEFILES_libmar
|
$MAKEFILES_libmar
|
||||||
|
$MAKEFILES_lcms
|
||||||
"
|
"
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -835,14 +842,6 @@ if [ "$MOZ_TREE_CAIRO" ] ; then
|
|||||||
"
|
"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! "$MOZ_NATIVE_LCMS" ] ; then
|
|
||||||
add_makefiles "
|
|
||||||
modules/lcms/Makefile
|
|
||||||
modules/lcms/include/Makefile
|
|
||||||
modules/lcms/src/Makefile
|
|
||||||
"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$MOZ_UNIVERSALCHARDET" ] ; then
|
if [ "$MOZ_UNIVERSALCHARDET" ] ; then
|
||||||
add_makefiles "
|
add_makefiles "
|
||||||
extensions/universalchardet/Makefile
|
extensions/universalchardet/Makefile
|
||||||
|
@ -70,9 +70,7 @@ endif
|
|||||||
tier_external_dirs += modules/libmar
|
tier_external_dirs += modules/libmar
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef MOZ_NATIVE_LCMS
|
|
||||||
tier_external_dirs += modules/lcms
|
tier_external_dirs += modules/lcms
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# tier "gecko" - core components
|
# tier "gecko" - core components
|
||||||
|
Loading…
Reference in New Issue
Block a user