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 1f0776f..3d5d745 100644 (file)
--- 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)" \
        (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) \
                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 \
                  --enable-shared \
                  --enable-static \
                  --disable-rpath \

+                 --with-gnu-ld \

                  --without-x \
                  --without-freetype \
                  --without-x \
                  --without-freetype \

+                 --without-jpeg \

                  --with-png=$(STAGING_DIR)/usr \
                  --with-png=$(STAGING_DIR)/usr \

+                 --without-xpm \

        )
        touch $@
 
        )
        touch $@