X-Git-Url: http://git.openwrt.org/?p=feed%2Fpackages.git;a=blobdiff_plain;f=net%2Fapache%2FMakefile;h=6763c4a0e9b0348dfe4ad2fe3a0b0457273357e9;hp=098e2befbf6eba6eeac89ae1bf1b4b1a6c496f89;hb=923b4558a62f38b9eab4ef1dc88dc3d4da78c5aa;hpb=ebbd1a2d881797af20187462245c4e9ec221c1d7

diff --git a/net/apache/Makefile b/net/apache/Makefile
index 098e2befbf..6763c4a0e9 100644
--- a/net/apache/Makefile
+++ b/net/apache/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apache
-PKG_VERSION:=2.4.27
+PKG_VERSION:=2.4.28
 PKG_RELEASE:=1
 PKG_SOURCE_NAME:=httpd
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
@@ -16,12 +16,23 @@ PKG_LICENSE:=Apache License
 
 PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@APACHE/httpd/
-PKG_HASH:=71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a
+PKG_HASH:=c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
 
 PKG_INSTALL:=1
 
+PKG_CONFIG_DEPENDS := \
+	CONFIG_APACHE_HTTP2
+
+ADDITIONAL_MODULES:=
+ifeq ($(CONFIG_APACHE_HTTP2),y)
+  ADDITIONAL_MODULES += --enable-http2
+endif
+ifneq ($(CONFIG_APACHE_HTTP2),y)
+  ADDITIONAL_MODULES += --enable-http2=no
+endif
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/apache/Default
@@ -38,9 +49,13 @@ define Package/apache/Default/description
  Server, it has grown to be the most popular web server on the Internet.
 endef
 
+define Package/apache/config
+  source "$(SOURCE)/Config.in"
+endef
+
 define Package/apache
 $(call Package/apache/Default)
-  DEPENDS:=+libapr +libaprutil +libpcre +libopenssl +unixodbc +zlib
+  DEPENDS:=+libapr +libaprutil +libpcre +libopenssl +unixodbc +zlib +APACHE_HTTP2:libnghttp2
 endef
 
 define Package/apache/description
@@ -90,13 +105,14 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-TARGET_LDFLAGS += -lpthread 
+TARGET_LDFLAGS += -lpthread
 
 define Build/Configure
 	$(call Build/Configure/Default, \
 		--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
 		--with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \
 		--with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \
+		$(ADDITIONAL_MODULES) \
 		--enable-http \
 		--with-crypto \
 		--with-sqlit3="$(STAGING_DIR)/usr" \