From e593016a80ceee52b6e3244512ff4307f8c208fa Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Wed, 10 May 2006 17:31:32 +0000 Subject: Add NTLM support. --- configure.in | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 433cc4a..e882a7c 100644 --- a/configure.in +++ b/configure.in @@ -36,8 +36,8 @@ dnl Nate Nielsen dnl dnl Process this file with autoconf to produce a configure script. -AC_INIT(httpauth, 0.4.93, nielsen@memberwebs.com) -AM_INIT_AUTOMAKE(httpauth, 0.4.93) +AC_INIT(httpauth, 0.4.94, nielsen@memberwebs.com) +AM_INIT_AUTOMAKE(httpauth, 0.4.94) LDFLAGS="$LDFLAGS -L/usr/local/lib" CFLAGS="$CFLAGS -I/usr/local/include -g -O0" @@ -66,6 +66,7 @@ fi AC_ARG_WITH(ldap, [ --with-ldap with LDAP support]) AC_ARG_WITH(pgsql, [ --with-pgsql with Postgres support]) AC_ARG_WITH(ldap, [ --with-mysql with MYSQL support]) +AC_ARG_ENABLE(ntlm, [ --enable-ntlm enable NTLM support]) # TODO: Figure out why we need this wierd hack ACX_PTHREAD( , [echo "ERROR: Pthread support not found."; exit 1] ) @@ -101,7 +102,7 @@ AC_CHECK_FUNCS([strlwr]) AM_CONDITIONAL(WITH_LDAP, test -n "$with_ldap") if test -n "$with_ldap"; then - echo "enabling LDAP support" + echo "enabling LDAP support" if test "$with_ldap" != "yes"; then LDFLAGS="$LDFLAGS -L$with_ldap/lib" @@ -162,12 +163,42 @@ if test -n "$with_mysql"; then AC_DEFINE_UNQUOTED(WITH_MYSQL, 1, [With MYSQL Support] ) fi +# NTLM Support +AM_CONDITIONAL(WITH_NTLM, test -n "$enable_ntlm") +if test -n "$enable_ntlm"; then + echo "enabling NTLM support" + AC_DEFINE_UNQUOTED(WITH_NTLM, 1, [With NTLM Support] ) +fi + # Have to resolve this for the path below if test "${prefix}" = "NONE"; then - prefix=$ac_default_prefix + prefix=$ac_default_prefix +fi + +# APACHE Build stuff + +AC_PATH_PROG(APXS, apxs, "failed") +if test "$APXS" = "failed"; then + AC_PATH_PROG(APXS2, apxs2, "apxs") + APXS=$APXS2 fi +AC_SUBST(APXS) + +AC_PATH_PROG(APACHECTL, apachectl, "failed") +if test "$APACHECTL" = "failed"; then + AC_PATH_PROG(APACHE2CTL, apache2ctl, "apachectl") + APACHECTL=$APACHE2CTL +fi + +AC_SUBST(APACHECTL) + + AC_DEFINE_UNQUOTED(CONF_PREFIX, "`eval echo ${sysconfdir}`", [Installation Prefix] ) -AC_CONFIG_FILES([Makefile daemon/Makefile doc/Makefile tools/Makefile]) +AC_CONFIG_FILES([Makefile + daemon/Makefile + doc/Makefile + tools/Makefile + apache2x/Makefile]) AC_OUTPUT -- cgit v1.2.3