Fix inconsistency between --sysconfdir and --with-confdir, deprecate --with-confdir.

The inconsistency was created in
c74836dc4a5bde1e0bf38da58053bf5f28da8ff5 where genssl.sh.in was made
to use sysconfdir while the IRCd and buildsystem still used confdir.

diff --git a/Makefile.in b/Makefile.in
index 849a8e1675fc0958093ef4106044f3b0e35839bf..70294b944064c4c297fee12a053e52dfcc14115b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,7 +28,7 @@ libdir          = @libdir@
 pkglibdir       = @pkglibdir@
 moduledir      = @moduledir@
 helpdir                = @helpdir@
-confdir                = @confdir@
+sysconfdir     = @sysconfdir@
 logdir         = @logdir@
 rundir         = @rundir@
 pkgrundir      = @pkgrundir@
@@ -129,8 +129,8 @@ install-mkdirs:
        -@if test ! -d $(DESTDIR)$(bindir); then \
                mkdir -p -m 755 $(DESTDIR)$(bindir); \
        fi
-       -@if test ! -d $(DESTDIR)$(confdir); then \
-               mkdir -p -m 755 $(DESTDIR)$(confdir); \
+       -@if test ! -d $(DESTDIR)$(sysconfdir); then \
+               mkdir -p -m 755 $(DESTDIR)$(sysconfdir); \
        fi
        -@if test ! -d $(DESTDIR)$(mandir); then \
                mkdir -p -m 755 $(DESTDIR)$(mandir); \

diff --git a/bandb/Makefile.in b/bandb/Makefile.in
index e915bc08717f90bf877256ac4e50b659cc0d43ef..0927d7c6e1579e82739c6053bfecd005f372c4db 100644 (file)
--- a/bandb/Makefile.in
+++ b/bandb/Makefile.in
@@ -23,7 +23,7 @@ bindir          = @bindir@
 libdir         = @libdir@
 libexecdir      = @libexecdir@
 pkglibexecdir   = @pkglibexecdir@
-confdir         = @confdir@
+sysconfdir     = @sysconfdir@
 localstatedir   = @localstatedir@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 

diff --git a/configure b/configure
index cf7817f2ce69b37e4af17e440b5d31bacca4ce0f..13d712333c2ae3f39d6f141295ee90e4135aff4a 100755 (executable)
--- a/configure
+++ b/configure
@@ -621,7 +621,6 @@ helpdir
 HELP_DIR
 logdir
 LOG_DIR
-confdir
 ETC_DIR
 ZLIB_LD
 ENCSPEED
@@ -1377,7 +1376,8 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-zlib-path=DIR    Path to libz.so for ziplinks support.
-  --with-confdir=DIR      Directory to install config files.
+  --with-confdir=DIR      Directory to install config files [deprecated, use
+                          --sysconfdir instead].
   --with-logdir=DIR       Directory where to write logfiles.
   --with-helpdir=DIR      Directory to install help files.
   --with-moduledir=DIR    Directory to install modules.
@@ -7275,48 +7275,18 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to modify confdir" >&5
-$as_echo_n "checking whether to modify confdir... " >&6; }
 
 # Check whether --with-confdir was given.
 if test "${with_confdir+set}" = set; then :
-  withval=$with_confdir;  confdir=`echo $withval | sed 's/\/$//'`
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  last_ac_define_dir=`eval echo $confdir`
-  ac_define_dir=`eval echo $last_ac_define_dir`
-  while test "x$last_ac_define_dir" != "x$ac_define_dir"; do
-    last_ac_define_dir="$ac_define_dir"
-    ac_define_dir=`eval echo $last_ac_define_dir`
-  done
-  ETC_DIR="$ac_define_dir"
-
-
-cat >>confdefs.h <<_ACEOF
-#define ETC_DIR "$ac_define_dir"
-_ACEOF
-
-
-
-
-        confdir=`(
-            test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-            test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
-            eval echo \""$confdir"\"
-        )`
-
-
+  withval=$with_confdir;  sysconfdir=`echo $withval | sed 's/\/$//'`
 else
    confdir='${sysconfdir}'
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+fi
+
 
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-  last_ac_define_dir=`eval echo $confdir`
+  last_ac_define_dir=`eval echo $sysconfdir`
   ac_define_dir=`eval echo $last_ac_define_dir`
   while test "x$last_ac_define_dir" != "x$ac_define_dir"; do
     last_ac_define_dir="$ac_define_dir"
@@ -7332,18 +7302,6 @@ _ACEOF
 
 
 
-        confdir=`(
-            test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-            test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
-            eval echo \""$confdir"\"
-        )`
-
-
-
-fi
-
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to modify logdir" >&5
 $as_echo_n "checking whether to modify logdir... " >&6; }
 

diff --git a/configure.ac b/configure.ac
index e908e8c1205d4ba48b69385ded7412d48ff55a79..06f51839351587f1e90313c64ccdf0fdc796cb61 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/doc/Makefile.in b/doc/Makefile.in
index e78b2071bfddd2b2600d2d159149afa05babf27f..d641146b4e502aaadcd516a47aa8f0c62560a80d 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -22,7 +22,7 @@ exec_prefix   = @exec_prefix@
 exec_suffix    = @exec_suffix@
 bindir         = @bindir@
 libexecdir     = @libexecdir@
-confdir                = @confdir@
+sysconfdir             = @sysconfdir@
 localstatedir  = @localstatedir@
 # Change this later! -- adrian
 moduledir      = @moduledir@
@@ -45,9 +45,9 @@ CPPFLAGS      = ${INCLUDES} @CPPFLAGS@
 all: build
  
 install-mkdirs:
-       -@if test ! -d $(DESTDIR)$(confdir); then \
-               echo "mkdir -p $(confdir)"; \
-               mkdir -p $(DESTDIR)$(confdir); \
+       -@if test ! -d $(DESTDIR)$(sysconfdir); then \
+               echo "mkdir -p $(sysconfdir)"; \
+               mkdir -p $(DESTDIR)$(sysconfdir); \
        fi
 
        -@if test ! -d $(DESTDIR)$(mandir); then \
@@ -58,19 +58,19 @@ install-mkdirs:
 install: install-mkdirs build
        @echo "ircd: installing example config files ($(CONFS))"
        @for i in $(CONFS); do \
-               if test -f $(DESTDIR)$(confdir)/$$i; then \
-                       $(MV) $(DESTDIR)$(confdir)/$$i $(DESTDIR)$(confdir)/$$i.old; \
+               if test -f $(DESTDIR)$(sysconfdir)/$$i; then \
+                       $(MV) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$i.old; \
                fi; \
-               $(INSTALL_DATA) $$i $(DESTDIR)$(confdir); \
+               $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
        done
 
-       -@if test ! -f $(DESTDIR)$(confdir)/ircd.motd; then \
+       -@if test ! -f $(DESTDIR)$(sysconfdir)/ircd.motd; then \
                echo "ircd: installing motd file (ircd.motd)"; \
-               $(INSTALL_DATA) ircd.motd $(DESTDIR)$(confdir); \
+               $(INSTALL_DATA) ircd.motd $(DESTDIR)$(sysconfdir); \
        fi
 
-       -@if test -f $(DESTDIR)$(confdir)/links.txt; then \
-               $(RM) $(DESTDIR)$(confdir)/links.txt; \
+       -@if test -f $(DESTDIR)$(sysconfdir)/links.txt; then \
+               $(RM) $(DESTDIR)$(sysconfdir)/links.txt; \
        fi
 
        @echo "ircd: installing manpage"

diff --git a/ssld/Makefile.in b/ssld/Makefile.in
index cdf3b85370a491c6303731cb070dc812449d1a63..c226b69b67de336b3195d8cd409ba5b0717e89a7 100644 (file)
--- a/ssld/Makefile.in
+++ b/ssld/Makefile.in
@@ -23,7 +23,7 @@ bindir          = @bindir@
 libdir         = @libdir@
 libexecdir      = @libexecdir@
 pkglibexecdir   = @pkglibexecdir@
-confdir         = @confdir@
+sysconfdir     = @sysconfdir@
 localstatedir   = @localstatedir@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 062713273c25b90ced79a36dcd5cfc2d8a7fbb22..cbd99c7c687377734d863136e32046e7565a13ee 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -26,7 +26,7 @@ exec_prefix   = @exec_prefix@
 bindir         = @bindir@
 libdir         = @libdir@
 libexecdir     = @libexecdir@
-confdir                = @confdir@
+sysconfdir     = @sysconfdir@
 localstatedir  = @localstatedir@
 
 PROGS          = viconf mkpasswd convertilines convertklines genssl.sh
@@ -71,7 +71,7 @@ exec_prefix   = @exec_prefix@
 exec_suffix    = @exec_suffix@
 bindir         = @bindir@
 libexecdir     = @libexecdir@
-confdir                = @confdir@
+sysconfdir     = @sysconfdir@
 localstatedir  = @localstatedir@
 # Change this later! -- adrian
 moduledir      = @moduledir@