wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 469558: --enable-system-lcms build option should be removed.r=vlad,sr=ted

Browse Source
This commit is contained in:
Bobby Holley 2009-01-12 16:20:45 -08:00
parent f4b909ff36
commit 475a3a6720
7 changed files with 13 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/Makefile.in
View File

@ -128,7 +128,6 @@ export::
-DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \
-DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
-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
$(INSTALL) system_wrappers $(DIST)/include

5
config/autoconf.mk.in
View File

@ -441,14 +441,9 @@ PNG_LIBS = @MOZ_PNG_LIBS@
PNG_REQUIRES = png
endif
MOZ_NATIVE_LCMS = @MOZ_NATIVE_LCMS@
LCMS_CFLAGS = @LCMS_CFLAGS@
LCMS_LIBS = @LCMS_LIBS@
ifdef MOZ_NATIVE_LCMS
LCMS_REQUIRES =
else
LCMS_REQUIRES = lcms
endif
MOZ_NATIVE_SQLITE = @MOZ_NATIVE_SQLITE@
SQLITE_CFLAGS = @SQLITE_CFLAGS@

12
config/system-headers
View File

@ -1014,18 +1014,6 @@ png.h
#if MOZ_NATIVE_ZLIB==1
zlib.h
#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
libsn/sn.h
libsn/sn-common.h

24
configure.in
View File

@ -7537,28 +7537,16 @@ dnl ========================================================
dnl Check for lcms
dnl ========================================================
MOZ_NATIVE_LCMS=
MOZ_ARG_ENABLE_BOOL(system-lcms,
[ --enable-system-lcms Use system lcms (located with pkgconfig)],
MOZ_NATIVE_LCMS=1,
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'
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
PKG_CHECK_MODULES(LCMS, lcms >= $LCMS_VERSION)
LCMS_LIBS='-L$(LIBXUL_DIST)/bin -lmozlcms'
fi
AC_SUBST(MOZ_NATIVE_LCMS)
AC_SUBST(LCMS_CFLAGS)
AC_SUBST(LCMS_LIBS)

12
js/src/config/system-headers
View File

@ -1014,18 +1014,6 @@ png.h
#if MOZ_NATIVE_ZLIB==1
zlib.h
#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
libsn/sn.h
libsn/sn-common.h

15
toolkit/toolkit-makefiles.sh
View File

@ -757,6 +757,12 @@ MAKEFILES_libmar="
modules/libmar/tool/Makefile
"
MAKEFILES_lcms="
modules/lcms/Makefile
modules/lcms/include/Makefile
modules/lcms/src/Makefile
"
add_makefiles "
$MAKEFILES_db
$MAKEFILES_dom
@ -799,6 +805,7 @@ add_makefiles "
$MAKEFILES_accessible
$MAKEFILES_zlib
$MAKEFILES_libmar
$MAKEFILES_lcms
"
#
@ -835,14 +842,6 @@ if [ "$MOZ_TREE_CAIRO" ] ; then
"
fi
if [ ! "$MOZ_NATIVE_LCMS" ] ; then
add_makefiles "
modules/lcms/Makefile
modules/lcms/include/Makefile
modules/lcms/src/Makefile
"
fi
if [ "$MOZ_UNIVERSALCHARDET" ] ; then
add_makefiles "
extensions/universalchardet/Makefile

2
toolkit/toolkit-tiers.mk
View File

@ -70,9 +70,7 @@ endif
tier_external_dirs += modules/libmar
endif
ifndef MOZ_NATIVE_LCMS
tier_external_dirs += modules/lcms
endif
#
# tier "gecko" - core components