Merge remote-tracking branch 'origin/topic/jsiwek/require-libmagic-libz'

* origin/topic/jsiwek/require-libmagic-libz:
  Promote libz and libmagic to required dependencies.

Conflicts:
	doc/quickstart.rst

Closes #674
This commit is contained in:
Robin Sommer 2011-11-15 17:08:24 -08:00
commit 7696c8b365
20 changed files with 26 additions and 114 deletions

View file

@ -2,7 +2,6 @@
# will normalize mime types other than the target type to prevent sensitivity
# to varying versions of libmagic.
# @TEST-REQUIRES: grep -q '#define HAVE_LIBMAGIC' $BUILD/config.h
# @TEST-EXEC: bro -r $TRACES/http-pipelined-requests.trace %INPUT > output
# @TEST-EXEC: btest-diff http.log