fix ssltunnel dependency on openssl

[openwrt.git] / openwrt / package / php4 / Makefile

diff --git a/openwrt/package/php4/Makefile b/openwrt/package/php4/Makefile
index 478154a..2644aa4 100644 (file)
--- a/openwrt/package/php4/Makefile
+++ b/openwrt/package/php4/Makefile
@@ -4,14 +4,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
 PKG_VERSION:=4.3.11
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=fbc67d240812136a9842bc1f2a217b7a
+
 PKG_SOURCE_URL:=http://fr.php.net/distributions/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
@@ -28,33 +28,59 @@ endef
 PKG_CONFIGURE_OPTS:= \
        --enable-shared \
        --disable-static \
-       --disable-ctype \
-       --disable-dom \
+       --disable-rpath \
+       --disable-debug \
+       --without-pear \
+       \
+       --with-config-file-path=/etc \
        --disable-ipv6 \
        --enable-magic-quotes \
        --enable-memory-limit \
        --disable-overload \
        --disable-short-tags \
-       --disable-tokenizer \
+       \
+       --disable-ctype \
+       --disable-dom \
        --enable-ftp=shared \
+       --without-gettext \
+       --without-iconv \
+       --disable-mbstring \
+       --disable-mbregex \
+       --with-openssl=shared,"$(STAGING_DIR)/usr" \
+         --with-kerberos=no \
+         --with-openssl-dir="$(STAGING_DIR)/usr" \
        --enable-session=shared \
        --enable-sockets=shared \
-       --enable-xml=shared \
-       --with-config-file-path=/etc \
-       --without-gettext \
-       --without-pear \
+       --disable-tokenizer \
        --with-zlib="$(STAGING_DIR)/usr" \
+         --with-zlib-dir="$(STAGING_DIR)/usr" \
 
+ifneq ($(BR2_PACKAGE_PHP4_MOD_CURL),)
+PKG_CONFIGURE_OPTS+= --with-curl=shared,"$(STAGING_DIR)/usr"
+else
+PKG_CONFIGURE_OPTS+= --without-curl
+endif
 ifneq ($(BR2_PACKAGE_PHP4_MOD_GD),)
 PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_DIR)/usr" \
-       --enable-gd-native-ttf \
+       --without-freetype-dir \
+       --without-jpeg-dir \
        --with-png-dir="$(STAGING_DIR)/usr" \
-       --with-zlib-dir="$(STAGING_DIR)/usr"
+       --without-xpm-dir \
+       --without-ttf \
+       --without-t1lib \
+       --enable-gd-native-ttf \
+       --disable-gd-jis-conv
 else
 PKG_CONFIGURE_OPTS+= --without-gd
 endif
+ifneq ($(BR2_PACKAGE_PHP4_MOD_GMP),)
+PKG_CONFIGURE_OPTS+= --with-gmp=shared,"$(STAGING_DIR)/usr"
+else
+PKG_CONFIGURE_OPTS+= --without-gmp
+endif
 ifneq ($(BR2_PACKAGE_PHP4_MOD_LDAP),)
 PKG_CONFIGURE_OPTS+= --with-ldap=shared,"$(STAGING_DIR)/usr"
+       --with-ldap-sasl="$(STAGING_DIR)/usr"
 else
 PKG_CONFIGURE_OPTS+= --without-ldap
 endif
@@ -63,11 +89,6 @@ PKG_CONFIGURE_OPTS+= --with-mysql=shared,"$(STAGING_DIR)/usr"
 else
 PKG_CONFIGURE_OPTS+= --without-mysql
 endif
-ifneq ($(BR2_PACKAGE_PHP4_MOD_OPENSSL),)
-PKG_CONFIGURE_OPTS+= --with-openssl=shared,"$(STAGING_DIR)/usr"
-else
-PKG_CONFIGURE_OPTS+= --without-openssl
-endif
 ifneq ($(BR2_PACKAGE_PHP4_MOD_PCRE),)
 PKG_CONFIGURE_OPTS+= --with-pcre-regex=shared,"$(STAGING_DIR)/usr"
 else
@@ -83,13 +104,21 @@ PKG_CONFIGURE_OPTS+= --with-sqlite=shared,"$(STAGING_DIR)/usr"
 else
 PKG_CONFIGURE_OPTS+= --without-sqlite
 endif
+ifneq ($(BR2_PACKAGE_PHP4_MOD_XML),)
+PKG_CONFIGURE_OPTS+= --enable-xml=shared \
+       --with-expat-dir="$(STAGING_DIR)/usr"
+else
+PKG_CONFIGURE_OPTS+= --disable-xml
+endif
 
 $(eval $(call PKG_template,PHP4_CLI,php4-cli,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,PHP4_CGI,php4-cgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,PHP4_FASTCGI,php4-fastcgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
+$(eval $(call PKG_template,PHP4_MOD_CURL,php4-mod-curl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,PHP4_MOD_FTP,php4-mod-ftp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,PHP4_MOD_GD,php4-mod-gd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,PHP4_MOD_GMP,php4-mod-gmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,PHP4_MOD_LDAP,php4-mod-ldap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,PHP4_MOD_MYSQL,php4-mod-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,PHP4_MOD_OPENSSL,php4-mod-openssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
@@ -100,8 +129,10 @@ $(eval $(call PKG_template,PHP4_MOD_SOCKETS,php4-mod-sockets,$(PKG_VERSION)-$(PK
 $(eval $(call PKG_template,PHP4_MOD_SQLITE,php4-mod-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,PHP4_MOD_XML,php4-mod-xml,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
+$(eval $(call PKG_mod_template,PHP4_MOD_CURL,curl))
 $(eval $(call PKG_mod_template,PHP4_MOD_FTP,ftp))
 $(eval $(call PKG_mod_template,PHP4_MOD_GD,gd))
+$(eval $(call PKG_mod_template,PHP4_MOD_GMP,gmp))
 $(eval $(call PKG_mod_template,PHP4_MOD_LDAP,ldap))
 $(eval $(call PKG_mod_template,PHP4_MOD_MYSQL,mysql))
 $(eval $(call PKG_mod_template,PHP4_MOD_OPENSSL,openssl))
@@ -122,6 +153,8 @@ $(PKG_BUILD_DIR)/.built:
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+               LIBS="-lcrypto -lssl" \
+               php_cv_cc_rpath="no" \
                ./configure \
                  --target=$(GNU_TARGET_NAME) \
                  --host=$(GNU_TARGET_NAME) \
@@ -130,7 +163,7 @@ $(PKG_BUILD_DIR)/.built:
                  --program-suffix="" \
                  --prefix=/usr \
                  --exec-prefix=/usr \
-                 --bindir=/usr/sbin \
+                 --bindir=/usr/bin \
                  --datadir=/usr/share \
                  --includedir=/usr/include \
                  --infodir=/usr/share/info \
@@ -156,6 +189,8 @@ $(PKG_BUILD_DIR)/.built:
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+               LIBS="-lcrypto -lssl" \
+               php_cv_cc_rpath="no" \
                ./configure \
                  --target=$(GNU_TARGET_NAME) \
                  --host=$(GNU_TARGET_NAME) \
@@ -164,7 +199,7 @@ $(PKG_BUILD_DIR)/.built:
                  --program-suffix="" \
                  --prefix=/usr \
                  --exec-prefix=/usr \
-                 --bindir=/usr/sbin \
+                 --bindir=/usr/bin \
                  --datadir=/usr/share \
                  --includedir=/usr/include \
                  --infodir=/usr/share/info \
@@ -191,6 +226,8 @@ $(PKG_BUILD_DIR)/.built:
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+               LIBS="-lcrypto -lssl" \
+               php_cv_cc_rpath="no" \
                ./configure \
                  --target=$(GNU_TARGET_NAME) \
                  --host=$(GNU_TARGET_NAME) \
@@ -225,16 +262,16 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_PHP4_CLI):
        install -m0755 -d $(IDIR_PHP4_CLI)/etc
        install -m0644 ./files/php.ini $(IDIR_PHP4_CLI)/etc/
-       install -m0755 -d $(IDIR_PHP4_CLI)/usr/sbin
-       cp -fpR $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP4_CLI)/usr/sbin/php
+       install -m0755 -d $(IDIR_PHP4_CLI)/usr/bin
+       cp -fpR $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP4_CLI)/usr/bin/php
        $(RSTRIP) $(IDIR_PHP4_CLI)
        $(IPKG_BUILD) $(IDIR_PHP4_CLI) $(PACKAGE_DIR)
 
 $(IPKG_PHP4_CGI):
        install -m0755 -d $(IDIR_PHP4_CGI)/etc
        install -m0644 ./files/php.ini $(IDIR_PHP4_CGI)/etc/
-       install -m0755 -d $(IDIR_PHP4_CGI)/usr/sbin
-       cp -fpR $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP4_CGI)/usr/sbin/php
+       install -m0755 -d $(IDIR_PHP4_CGI)/usr/bin
+       cp -fpR $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP4_CGI)/usr/bin/php
        $(RSTRIP) $(IDIR_PHP4_CGI)
        $(IPKG_BUILD) $(IDIR_PHP4_CGI) $(PACKAGE_DIR)