summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stef@memberwebs.com>2004-08-25 00:10:51 +0000
committerStef Walter <stef@memberwebs.com>2004-08-25 00:10:51 +0000
commit97bad4918cb759689a72d8635004a7ee92dd8e51 (patch)
tree266a2f558453f27d51be1d1466f0dc28fcadd79f
parent66bb0fb11442101a329e90a558b0d74ca1afe4fc (diff)
Default configuration follows ./configure prefix
-rw-r--r--configure.in7
-rw-r--r--daemon/httpauthd.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 87b485c..9978332 100644
--- a/configure.in
+++ b/configure.in
@@ -170,5 +170,12 @@ if test -n "$enable_ntlm"; then
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
+fi
+
+AC_DEFINE_UNQUOTED(CONF_PREFIX, "`eval echo ${sysconfdir}`", [Installation Prefix] )
+
AC_CONFIG_FILES([Makefile daemon/Makefile doc/Makefile tools/Makefile])
AC_OUTPUT
diff --git a/daemon/httpauthd.c b/daemon/httpauthd.c
index b56f3d2..3f87771 100644
--- a/daemon/httpauthd.c
+++ b/daemon/httpauthd.c
@@ -105,7 +105,7 @@ httpauth_thread_t;
* Default Settings
*/
-#define DEFAULT_CONFIG "/usr/local/etc/httpauthd.conf"
+#define DEFAULT_CONFIG CONF_PREFIX "/httpauthd.conf"
#define DEFAULT_SOCKET "/var/run/httpauthd.sock"
#define DEFAULT_MAXTHREADS 32