[3/3] New package: c-icap-modules Additionals modules for c-icap server.

This patch adds c-icap-modules, additionnal modules for c-icap.

Signed-off-by: Guillaume GARDET <guillaume.gardet@oliseo.fr>

---
 package/Config.in                        |  1 +
 package/c-icap-modules/Config.in         |  7 +++++++
 package/c-icap-modules/c-icap-modules.mk | 27 +++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 package/c-icap-modules/Config.in
 create mode 100644 package/c-icap-modules/c-icap-modules.mk

\ No newline at end of file

Dear Guillaume GARDET,

Title should be:

	c-icap-modules: new package

On Thu, 18 Sep 2014 11:27:06 +0200, Guillaume GARDET wrote:

> diff --git a/package/Config.in b/package/Config.in
> index 24a0a8e..86a50ae 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -951,6 +951,7 @@ menu "Networking applications"
>  	source "package/bridge-utils/Config.in"
>  	source "package/bwm-ng/Config.in"
>  	source "package/c-icap/Config.in"
> +	source "package/c-icap-modules/Config.in"
>  	source "package/can-utils/Config.in"
>  	source "package/chrony/Config.in"
>  	source "package/civetweb/Config.in"
> diff --git a/package/c-icap-modules/Config.in b/package/c-icap-modules/Config.in
> new file mode 100644
> index 0000000..7946c17
> --- /dev/null
> +++ b/package/c-icap-modules/Config.in
> @@ -0,0 +1,7 @@
> +config BR2_PACKAGE_C_ICAP_MODULES
> +        bool "c-icap-modules"

Indentation should be one tab.

> +	depends on BR2_PACKAGE_C_ICAP
> +	help
> +          Additionals modules for c-icap server.
> +
> +          http://c-icap.sourceforge.net/
> \ No newline at end of file

Missing newline at end of file.

> diff --git a/package/c-icap-modules/c-icap-modules.mk b/package/c-icap-modules/c-icap-modules.mk
> new file mode 100644
> index 0000000..683dd4f
> --- /dev/null
> +++ b/package/c-icap-modules/c-icap-modules.mk
> @@ -0,0 +1,27 @@
> +################################################################################
> +#
> +# c-icap-modules
> +#
> +################################################################################
> +
> +C_ICAP_MODULES_VERSION = 0.3.2
> +C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz
> +C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap/
> +C_ICAP_MODULES_INSTALL_STAGING = NO
> +C_ICAP_MODULES_INSTALL_TARGET = YES

Those two lines are not needed, since it's the default.

> +C_ICAP_MODULES_CONF_OPT = --with-c-icap=$(STAGING_DIR)/usr/ --includedir=$(STAGING_DIR)/usr/include/  \
> +		CPPFLAGS="-I $(STAGING_DIR)/usr/include/ -I $(STAGING_DIR)/usr/include/c_icap/" \
> +		CFLAGS="$(CFLAGS) -I $(STAGING_DIR)/usr/include/ -I $(STAGING_DIR)/usr/include/c_icap/"

--with-c-icap and --includedir can indeed go in
C_ICAP_MODULES_CONF_OPTS. However, the other two should go in
C_ICAP_MODULES_CONF_ENV.

Are you sure --includedir=$(STAGING_DIR)/usr/include is needed? It
seems wrong, because --includedir indicates the include directory on
the target... which clearly isn't $(STAGING_DIR)/usr/include.

Also, the two -I$(STAGING_DIR)/usr/include are not needed, the compiler
already looks there by default for header files. The
-I$(STAGING_DIR)/usr/include/c_icap/ might be needed, though.

> +C_ICAP_MODULES_DEPENDENCIES = c-icap
> +
> +define C_ICAP_MODULES_REMOVE_BROKEN_INCLUDE_PATH
> +	$(SED) "s#-I/usr/include -I/usr/include/c_icap###" $(C_ICAP_MODULES_DIR)/Makefile
> +	$(SED) "s#-I/usr/include -I/usr/include/c_icap###" $(C_ICAP_MODULES_DIR)/services/Makefile
> +	$(SED) "s#-I/usr/include -I/usr/include/c_icap###" $(C_ICAP_MODULES_DIR)/services/url_check/Makefile
> +	$(SED) "s#-I/usr/include -I/usr/include/c_icap###" $(C_ICAP_MODULES_DIR)/services/virus_scan/Makefile	
> +endef
> +
> +
> +C_ICAP_MODULES_POST_CONFIGURE_HOOKS = C_ICAP_MODULES_REMOVE_BROKEN_INCLUDE_PATH

I'm tempted to say that those fixes should be done by using a patch
rather than using some SED expression. And of course, the patch should
be submitted to the upstream c-icap-modules project, so that one day, a
new upstream version can be used in Buildroot and we can remove the
fixup patch.

> +
> +$(eval $(autotools-package))
> \ No newline at end of file

Missing newline at end of file.

Same as the other patches: could you take into account the comments,
and submit an updated version?

Thanks a lot!

Thomas