gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

neon: cleanup

Browse Source 
Whitespace fixes / removal of redundant lines. No functional change.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2011-10-11 09:23:25 +02:00
parent 8ece8e2775
commit 66e09abc57
1 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
package/neon/neon.mk
View File

@ -3,46 +3,45 @@
# neon # neon
# #
############################################################# #############################################################
NEON_VERSION:=0.29.6 NEON_VERSION= 0.29.6
NEON_SITE:=http://www.webdav.org/neon/ NEON_SITE = http://www.webdav.org/neon/
NEON_INSTALL_STAGING:=YES NEON_INSTALL_STAGING = YES
NEON_CONF_OPT:=--without-gssapi --disable-rpath NEON_CONF_OPT = --without-gssapi --disable-rpath
NEON_DEPENDENCIES:=host-pkg-config NEON_DEPENDENCIES = host-pkg-config
ifeq ($(BR2_PACKAGE_NEON_ZLIB),y)
NEON_CONF_OPT += --with-zlib=$(STAGING_DIR)
NEON_DEPENDENCIES += zlib
else
NEON_CONF_OPT += --without-zlib
endif
ifeq ($(BR2_PACKAGE_NEON_SSL),y)
NEON_CONF_OPT += --with-ssl
NEON_DEPENDENCIES += openssl
else
NEON_CONF_OPT += --without-ssl
endif
ifeq ($(BR2_PACKAGE_NEON_EXPAT),y)
NEON_CONF_OPT += --with-expat=$(STAGING_DIR)/usr/lib/libexpat.la
NEON_DEPENDENCIES += expat
else
NEON_CONF_OPT += --with-expat=no
endif
ifeq ($(BR2_PACKAGE_NEON_LIBXML2),y) ifeq ($(BR2_PACKAGE_NEON_LIBXML2),y)
NEON_CONF_OPT+=--with-libxml2=yes NEON_CONF_OPT += --with-libxml2=yes
NEON_CONF_OPT+=--with-expat=no NEON_CONF_ENV += ac_cv_prog_XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config
NEON_CONF_ENV+=ac_cv_prog_XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config NEON_DEPENDENCIES += libxml2
NEON_DEPENDENCIES+=libxml2
endif
ifeq ($(BR2_PACKAGE_NEON_ZLIB),y)
NEON_CONF_OPT+=--with-zlib=$(STAGING_DIR)
NEON_DEPENDENCIES+=zlib
else else
NEON_CONF_OPT+=--without-zlib NEON_CONF_OPT += --with-libxml2=no
endif
ifeq ($(BR2_PACKAGE_NEON_SSL),y)
NEON_CONF_OPT+=--with-ssl
NEON_DEPENDENCIES+=openssl
else
NEON_CONF_OPT+=--without-ssl
endif
ifeq ($(BR2_PACKAGE_NEON_EXPAT),y)
NEON_CONF_OPT+=--with-expat=$(STAGING_DIR)/usr/lib/libexpat.la
NEON_CONF_OPT+=--with-libxml2=no
NEON_DEPENDENCIES+=expat
endif
ifeq ($(BR2_PACKAGE_NEON_NOXML),y)
# webdav needs xml support
NEON_CONF_OPT+=--disable-webdav
endif endif
ifeq ($(BR2_PACKAGE_OPENSSL),y) ifeq ($(BR2_PACKAGE_NEON_NOXML),y)
NEON_CONF_OPT+=--with-ssl # webdav needs xml support
NEON_DEPENDENCIES+=openssl NEON_CONF_OPT += --disable-webdav
else
NEON_CONF_OPT+=--without-ssl
endif endif
define NEON_REMOVE_CONFIG_SCRIPTS define NEON_REMOVE_CONFIG_SCRIPTS