mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-09-29 11:16:33 +03:00
More configure cleanup.
Update docs for new install: configure && make && make install Spell check the docs.
This commit is contained in:
@@ -10,6 +10,7 @@ MOD_SECURITY2_H = re.h modsecurity.h msc_logging.h msc_multipart.h msc_parsers.h
|
||||
msc_geo.h acmp.h utf8tables.h msc_lua.h
|
||||
|
||||
CC = @CC@
|
||||
PERL = @PERL@
|
||||
EXTRA_CFLAGS = @EXTRA_CFLAGS@
|
||||
MODSEC_EXTRA_CFLAGS = @MODSEC_EXTRA_CFLAGS@
|
||||
|
||||
@@ -64,7 +65,7 @@ clean: clean-extras
|
||||
@rm -rf *.la *.lo *.o *.slo .libs msc_test
|
||||
|
||||
maintainer-clean: clean
|
||||
@rm -rf Makefile config config.log config.status configure mod_security2_config.h
|
||||
@rm -rf Makefile mlogc-src/Makefile t/run-tests.pl config config.log config.status configure mod_security2_config.h
|
||||
|
||||
dist-clean: maintainer-clean
|
||||
|
||||
@@ -91,8 +92,8 @@ TESTOBJS = re.o re_operators.o re_actions.o re_tfns.o re_variables.o \
|
||||
msc_test: mod_security2.la msc_test.c
|
||||
@$(CC) $(CPPFLAGS) $(LDFLAGS) $(APXS_INCLUDES) $(EXTRA_CFLAGS) $(MODSEC_EXTRA_CFLAGS) $(APR_CFLAGS) $(APU_CFLAGS) -o msc_test $(TESTOBJS) msc_test.c $(LIBS) $(APR_LIBS) $(APU_LIBS) $(APXS_LIBS) $(APR_LINK_LD) $(APU_LINK_LD)
|
||||
|
||||
test: msc_test
|
||||
@t/run-tests.pl
|
||||
test: t/run-tests.pl msc_test
|
||||
@$(PERL) t/run-tests.pl
|
||||
|
||||
mlogc:
|
||||
@$(MAKE) -C mlogc-src mlogc \
|
||||
|
@@ -19,6 +19,7 @@ AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_MAKE_SET
|
||||
AC_PROG_RANLIB
|
||||
AC_PATH_PROGS(PERL, perl perl5, )
|
||||
|
||||
# Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
@@ -233,6 +234,9 @@ CHECK_LUA()
|
||||
CHECK_CURL()
|
||||
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
if test -e "$PERL"; then
|
||||
AC_CONFIG_FILES([t/run-tests.pl])
|
||||
fi
|
||||
if test -e "mlogc-src/Makefile.in"; then
|
||||
AC_CONFIG_FILES([mlogc-src/Makefile])
|
||||
fi
|
||||
|
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/perl
|
||||
#!@PERL@
|
||||
#
|
||||
# Run unit tests.
|
||||
#
|
Reference in New Issue
Block a user