From: Björn R. <br...@us...> - 2010-11-08 10:00:51
|
Update of /cvsroot/devil-linux/build/scripts In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8156 Modified Files: modsecurity-apache Log Message: mlogc needs curl to build Index: modsecurity-apache =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/modsecurity-apache,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- modsecurity-apache 26 Apr 2010 14:27:22 -0000 1.2 +++ modsecurity-apache 8 Nov 2010 10:00:42 -0000 1.3 @@ -22,18 +22,23 @@ cd apache2 || exit 1 ./configure --prefix=/usr || exit 1 make all || exit 1 - make -C mlogc-src all || exit 1 + if [ "$CONFIG_CURL" = "y" ]; then + # mlogc needs curl to build + make -C mlogc-src all || exit 1 + fi fi ;; install ) if [ "$CONFIG_HTTPD" = "y" ] && [ "$CONFIG_MODSECURITY" = "y" ]; then - cp -v apache2/.libs/mod_security2.so $CDDIR/usr/lib/apache2/modules/ || exit 1 - mkdir -p $ETCDIR/etc/apache2/modsecurity_crs || exit 1 - cp -vR rules/* $ETCDIR/etc/apache2/modsecurity_crs/ || exit 1 - cp -v apache2/mlogc-src/mlogc $CDDIR/usr/bin/ || exit 1 - cp -v apache2/mlogc-src/mlogc-batch-load.pl $CDDIR/usr/bin/ || exit 1 - cp -v apache2/mlogc-src/mlogc-default.conf $ETCDIR/etc/ || exit 1 + cp -v apache2/.libs/mod_security2.so $CDDIR/usr/lib/apache2/modules/ || exit 1 + mkdir -p $ETCDIR/etc/apache2/modsecurity_crs || exit 1 + cp -vR rules/* $ETCDIR/etc/apache2/modsecurity_crs/ || exit 1 + if [ "$CONFIG_CURL" = "y" ]; then + cp -v apache2/mlogc-src/mlogc $CDDIR/usr/bin/ || exit 1 + cp -v apache2/mlogc-src/mlogc-batch-load.pl $CDDIR/usr/bin/ || exit 1 + cp -v apache2/mlogc-src/mlogc-default.conf $ETCDIR/etc/ || exit 1 + fi fi ;; |