--- configure.orig	Fri Dec  9 00:53:00 2005
+++ configure	Mon Jan  9 03:11:02 2006
@@ -351,6 +351,12 @@
 oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
+moduledir='${prefix}/modules'
+automoduledir='${prefix}/modules/autoload'
+uhelpdir='${prefix}/help/users'
+ohelpdir='${prefix}/help/opers'
+messagedir='${prefix}/messages'
+logsdir='/var/log/ircd'
 
 ac_prev=
 for ac_option
@@ -479,6 +485,24 @@
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
     mandir=$ac_optarg ;;
 
+  -moduledir=* | --moduledir=*)
+  moduledir=$ac_optarg ;;
+
+  -automoduledir=* | --automoduledir=*)
+  automoduledir=$ac_optarg ;;
+
+  -uhelpdir=* | --uhelpdir=*)
+  uhelpdir=$ac_optarg ;;
+
+  -ohelpdir=* | --ohelpdir=*)
+  ohelpdir=$ac_optarg ;;
+
+  -logsdir=* | --logsdir=*)
+  logsdir=$ac_optarg ;;
+
+  -messagedir=* | --messagedir=*)
+  messagedir=$ac_optarg ;;
+
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
     with_fp=no ;;
@@ -670,7 +694,8 @@
 
 # Be sure to have absolute paths.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
+	      localstatedir libdir includedir oldincludedir infodir mandir \
+	      moduledir automoduledir uhelpdir ohelpdir messagedir logsdir
 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
@@ -10800,6 +10825,13 @@
 
 cat >>confdefs.h <<_ACEOF
 #define IRCD_PREFIX "$ac_default_prefix"
+#define MODPATH "$moduledir/"
+#define AUTOMODPATH "$automoduledir/"
+#define UHPATH "$uhelpdir/"
+#define HPATH "$ohelpdir/"
+#define MSGPATH "$messagedir/"
+#define LOGPATH "$logsdir" 
+#define ETCPATH "$sysconfdir"
 _ACEOF
 
 
@@ -10810,12 +10842,19 @@
 
 cat >>confdefs.h <<_ACEOF
 #define IRCD_PREFIX "$prefix"
+#define MODPATH "$moduledir/"
+#define AUTOMODPATH "$automoduledir/"
+#define UHPATH "$uhelpdir/"
+#define HPATH "$ohelpdir/"
+#define MSGPATH "$messagedir/"
+#define LOGPATH "$logsdir"
+#define ETCPATH "$sysconfdir"
 _ACEOF
 
 
 fi
 
-                                                                                                                                  ac_config_files="$ac_config_files Makefile etc/Makefile servlink/Makefile contrib/Makefile contrib/help/Makefile src/Makefile messages/Makefile modules/Makefile tools/Makefile doc/Makefile help/Makefile lib/Makefile lib/pcre/Makefile"
+                                                                                                                                  ac_config_files="$ac_config_files Makefile etc/Makefile servlink/Makefile contrib/Makefile contrib/help/Makefile help/Makefile src/Makefile messages/Makefile modules/Makefile tools/Makefile doc/Makefile help/Makefile lib/Makefile lib/pcre/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -11418,6 +11457,8 @@
 s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
 s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
 s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@UPATH@,$uhelpdir,;t t
+s,@HPATH@,$ohelpdir,;t t
 s,@exec_prefix@,$exec_prefix,;t t
 s,@prefix@,$prefix,;t t
 s,@program_transform_name@,$program_transform_name,;t t
@@ -11433,6 +11474,12 @@
 s,@oldincludedir@,$oldincludedir,;t t
 s,@infodir@,$infodir,;t t
 s,@mandir@,$mandir,;t t
+s,@moduledir@,$moduledir,;t t
+s,@automoduledir@,$automoduledir,;t t
+s,@uhelpdir@,$uhelpdir,;t t
+s,@ohelpdir@,$ohelpdir,;t t
+s,@logsdir@,$logsdir,;t t
+s,@messagedir@,$messagedir,;t t
 s,@build_alias@,$build_alias,;t t
 s,@host_alias@,$host_alias,;t t
 s,@target_alias@,$target_alias,;t t