From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 25 Sep 2005 11:57:40 +0000 (+0000)
Subject: disable jpeg and xpm explicitly
X-Git-Tag: fast2504n-3.10.28-merged~24207
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=67ebf100859401eb43d3997523ef527d3a0a4144;p=openwrt.git

disable jpeg and xpm explicitly


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1992 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/openwrt/package/libgd/Makefile b/openwrt/package/libgd/Makefile
index 1f0776f046..3d5d745785 100644
--- a/openwrt/package/libgd/Makefile
+++ b/openwrt/package/libgd/Makefile
@@ -22,8 +22,8 @@ $(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 		LIBPNG12_CONFIG="$(STAGING_DIR)/usr/bin/libpng12-config" \
 		./configure \
 		  --target=$(GNU_TARGET_NAME) \
@@ -48,9 +48,12 @@ $(PKG_BUILD_DIR)/.configured:
 		  --enable-shared \
 		  --enable-static \
 		  --disable-rpath \
+		  --with-gnu-ld \
 		  --without-x \
 		  --without-freetype \
+		  --without-jpeg \
 		  --with-png=$(STAGING_DIR)/usr \
+		  --without-xpm \
 	)
 	touch $@