-AC_MSG_CHECKING([whether to use SHA1 function from system libcrypto])
-AC_MSG_RESULT([$WITH_LIBCRYPTO])
-
-if test "x$WITH_LIBCRYPTO" = "xyes" -a "x$ENABLE_SSSE3_SHA1" = "xno"; then
- AC_DEFINE([WITH_LIBCRYPTO], [1], [Define to 1 if using libcrypto SHA1])
- LIBCRYPTO_LDADD=`pkg-config --libs libcrypto 2>/dev/null`
- if test $? -ne 0; then
- LIBCRYPTO_LDADD=-lcrypto;
- fi
- LIBCRYPTO_CFLAGS=`pkg-config --cflags libcrypto 2>/dev/null`
-else
- LIBCRYPTO_LDADD=
- LIBCRYPTO_CFLAGS=
+
+AC_MSG_CHECKING([whether to include assertions])
+AC_ARG_ENABLE([assertions],
+ AS_HELP_STRING([--disable-assertions], [do not include assertions]),
+ [ENABLE_ASSERTIONS=$enableval],
+ [ENABLE_ASSERTIONS=yes])
+AC_MSG_RESULT([$ENABLE_ASSERTIONS])
+if test "$ENABLE_ASSERTIONS" = "yes"; then
+ AC_DEFINE([ENABLE_ASSERTIONS], [1], [Define to 1 if including assertions])
+fi
+
+AC_MSG_CHECKING([whether to include support for multi-threaded compression])
+AC_ARG_ENABLE([multithreaded-compression],
+ AS_HELP_STRING([--disable-multithreaded-compression],
+ [disable support for multithreaded compression]),
+ [ENABLE_MULTITHREADED_COMPRESSION=$enableval],
+ [ENABLE_MULTITHREADED_COMPRESSION=yes])
+AC_MSG_RESULT([$ENABLE_MULTITHREADED_COMPRESSION])
+if test "$ENABLE_MULTITHREADED_COMPRESSION" = "yes"; then
+ AC_DEFINE([ENABLE_MULTITHREADED_COMPRESSION], [1],
+ [Define to 1 to support multithreaded compression])
+fi
+
+AC_ARG_WITH(pkgconfigdir,
+ [ --with-pkgconfigdir=DIR pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@],
+ [pkgconfigdir=$withval],
+ [pkgconfigdir='${libdir}/pkgconfig'])
+AC_SUBST(pkgconfigdir)
+
+AC_MSG_CHECKING([whether to enable supporting code for tests])
+AC_ARG_ENABLE([test-support],
+ [AS_HELP_STRING([--enable-test-support],
+ [Enable supporting code for tests (developers only)])],
+ [ENABLE_TEST_SUPPORT=$enableval],
+ [ENABLE_TEST_SUPPORT=no])
+AC_MSG_RESULT([$ENABLE_TEST_SUPPORT])
+if test "$ENABLE_TEST_SUPPORT" = "yes" ; then
+ AC_DEFINE([ENABLE_TEST_SUPPORT], [1],
+ [Define to 1 to enable supporting code for tests])