Mercurial > hg > release > icedtea7-forest-2.0 > jdk

changeset 4548:0cb15650412a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issues with system CUPS build. Contributed-by: Damien Raude-Morvan <drazzib@drazzib.com>
author andrew
date Wed, 21 Sep 2011 16:50:51 +0100
parents a8b6a570543b
children f093b908503d
files make/sun/awt/FILES_c_unix.gmk make/sun/awt/mawt.gmk
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/sun/awt/FILES_c_unix.gmk	Sun Sep 18 17:00:57 2011 +0100
+++ b/make/sun/awt/FILES_c_unix.gmk	Wed Sep 21 16:50:51 2011 +0100
@@ -231,11 +231,11 @@
 	CUPSfuncs.c
 
 ifndef USE_SYSTEM_CUPS
-FILES_NO_MOTIF_c = \
+FILES_NO_MOTIF_c += \
 	cups_fp.c
 endif
 
 ifndef USE_SYSTEM_FONTCONFIG
-FILES_NO_MOTIF_c = \
+FILES_NO_MOTIF_c += \
 	fontconfig_fp.c
 endif
--- a/make/sun/awt/mawt.gmk	Sun Sep 18 17:00:57 2011 +0100
+++ b/make/sun/awt/mawt.gmk	Wed Sep 21 16:50:51 2011 +0100
@@ -103,6 +103,10 @@
 vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)/image
 vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/robot_child
 
+ifndef USE_SYSTEM_CUPS
+vpath %.c   $(PLATFORM_SRC)/native/common/deps
+endif
+
 ifndef USE_SYSTEM_FONTCONFIG
 vpath %.c   $(PLATFORM_SRC)/native/common/deps/fontconfig2
 endif
@@ -186,6 +190,10 @@
 OTHER_LDLIBS += $(JVMLIB) $(LIBCXX) \
                 -lawt $(LIBM)
 
+ifdef USE_SYSTEM_CUPS
+  OTHER_LDLIBS += $(CUPS_LIBS)
+endif
+
 ifdef USE_SYSTEM_FONTCONFIG
   OTHER_LDLIBS += $(FONTCONFIG_LIBS)
 else