X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/c74836dc4a5bde1e0bf38da58053bf5f28da8ff5..9e7c93067226337decd23dd4fa0ed40dc123f6f4:/configure.ac

diff --git a/configure.ac b/configure.ac
index 9ab0cbf9..b58de4ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.57)
 dnl Sneaky way to get an Id tag into the configure script
 AC_COPYRIGHT([$Id: configure.ac 3516 2007-06-10 16:14:03Z jilles $])
 
-AC_INIT([charybdis], [3.4.0-dev])
+AC_INIT([charybdis], [3.5.0-dev])
 
 AC_CONFIG_HEADER(include/setup.h)
 
@@ -226,7 +226,7 @@ if test "$LEX" = ":"; then
 fi
 
 AC_ARG_ENABLE([fhs-paths],
-	[AS_HELP_STRING([--enable-fhs-paths], [User more FHS-like pathnames (for packagers).])],
+	[AS_HELP_STRING([--enable-fhs-paths], [Use more FHS-like pathnames (for packagers).])],
 	[],
 	[dnl detect if the user appears to want --enable-fhs-paths
 	AS_IF([test "$libexecdir" = '${exec_prefix}/libexec' && \
@@ -253,7 +253,7 @@ AC_SUBST([pkglibdir])
 AC_SUBST([rundir])
 AC_SUBST([pkgrundir])
 AC_SUBST([pkglocalstatedir])
-AC_DEFINE_DIR([PKGLOCALSTATEDIR], [pkglocalstatedir], [[Directory in which to store state, such as band database]])
+AC_DEFINE_DIR([PKGLOCALSTATEDIR], [pkglocalstatedir], [[Directory in which to store state, such as ban database]])
 AC_SUBST([pkglibexecdir])
 AC_DEFINE_DIR([PKGLIBEXECDIR], [pkglibexecdir], [Directory where binaries the IRCd itself spawns live])
 
@@ -609,22 +609,15 @@ AC_ARG_ENABLE(epoll, AC_HELP_STRING([--enable-epoll],[Force sys_epoll usage (Lin
 ],)
 
 dnl **********************************************************************
-dnl Check for --with-confdir
+dnl Check for --with-confdir [deprecated, use --sysconfdir instead]
 dnl **********************************************************************
 
-AC_MSG_CHECKING([whether to modify confdir])
-AC_ARG_WITH(confdir, 
-AC_HELP_STRING([--with-confdir=DIR],
-	       [Directory to install config files.]),
-	       [ confdir=`echo $withval | sed 's/\/$//'`
-		 AC_MSG_RESULT(yes)
-		 AC_DEFINE_DIR(ETC_DIR, confdir, [Prefix where config files are installed.])
-		 AC_SUBST_DIR([confdir]) ],
-	       [ confdir='${sysconfdir}'
-		 AC_MSG_RESULT(no)
-	         AC_DEFINE_DIR(ETC_DIR, confdir, [Prefix where config files are installed.])
-	  	 AC_SUBST_DIR([confdir])]
-)
+AC_ARG_WITH([confdir],
+	[AC_HELP_STRING([--with-confdir=DIR],
+	       [Directory to install config files [deprecated, use --sysconfdir instead].])],
+	[ sysconfdir=`echo $withval | sed 's/\/$//'` ],
+	[ confdir='${sysconfdir}' ])
+AC_DEFINE_DIR([ETC_DIR], [sysconfdir], [Prefix where config files are installed.])
 
 dnl **********************************************************************
 dnl Check for --with-logdir
@@ -1247,11 +1240,11 @@ AC_CONFIG_FILES(			\
 	src/Makefile			\
 	modules/Makefile		\
 	tools/Makefile			\
-	tools/genssl.sh			\
+	tools/genssl			\
 	doc/Makefile			\
 	help/Makefile			\
 )
-AC_CONFIG_COMMANDS([tools/genssl.sh_chmod], [chmod 755 tools/genssl.sh])
+AC_CONFIG_COMMANDS([tools/genssl_chmod], [chmod 755 tools/genssl])
 
 AC_OUTPUT