jdk/makefiles/CompileNativeLibraries.gmk

@@ -2383,22 +2383,26 @@
 
 ##########################################################################################
 
 ifndef BUILD_HEADLESS_ONLY
 LIBSPLASHSCREEN_DIRS:=\
-        $(JDK_TOPDIR)/src/share/native/sun/awt/giflib \
         $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
         $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
         $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
 
+ifeq ($(USE_EXTERNAL_LIBGIF),true)
+    LIBGIF := -lgif
+else
+    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib
+endif
+
 ifneq ($(OPENJDK_TARGET_OS), macosx)
     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
 else
     LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
 endif
 
-
 LIBSPLASHSCREEN_CFLAGS:=-DSPLASHSCREEN -DPNG_NO_MMX_CODE \
         $(foreach dir,$(LIBSPLASHSCREEN_DIRS),-I$(dir))
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
         LIBSPLASHSCREEN_CFLAGS:=-I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \

@@ -2450,11 +2454,11 @@
                 OPTIMIZATION:=LOW, \
                 CFLAGS:=$(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB),\
                 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \
                 LDFLAGS:=$(LDFLAGS_JDKLIB) \
                          $(call SET_SHARED_LIBRARY_ORIGIN),\
-                LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ),\
+                LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(LIBGIF),\
                 LDFLAGS_SUFFIX_solaris:=-lc,\
                 VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
                 RC_FLAGS:=$(RC_FLAGS)\
                           -D "JDK_FNAME=splashscreen.dll" \
                           -D "JDK_INTERNAL_NAME=splashscreen" \