Add Rizon flag to configure.ac, move Rizon modules into separate directory.

diff --git a/configure.ac b/configure.ac
index f8e330d550efbd1df0e1024d163dba55258a09e3..e4cada5ed66cf4a2292fb78685b35a131c7a07dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -143,6 +143,14 @@ AC_ARG_ENABLE( [poll],
        AS_HELP_STRING([--disable-poll], [use select() instead of poll()]),
        [POLL="$enableval"],
        [POLL="yes"])
+AC_ARG_WITH( [rizon],
+       AS_HELP_STRING([--with-rizon={US,EU}], [enable building of rizon-specific modules]),
+       [RIZON=$withval],
+       [RIZON="no"])
+
+if test "x$RIZON" != "xno"; then
+       appendCXX -DRIZON_$RIZON
+fi
 
 if test "$DEBUG" != "no"; then
        appendCXX -ggdb
@@ -528,6 +536,7 @@ AC_OUTPUT
 echo
 echo znc AC_PACKAGE_VERSION configured
 echo
+echo "rizon:        $RIZON"
 echo "prefix:       $prefix"
 echo "debug:        $DEBUG"
 echo "ipv6:         $IPV6"

diff --git a/modules/Makefile.in b/modules/Makefile.in
index f0ab8c11d145349e98abb313edd8a1d8ed424164..891721060e7cbae970ef3d2c8ca52419aab5c2ed 100644 (file)
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -64,6 +64,11 @@ ifeq "@EXTRA@" "yes"
 FILES    += $(addprefix extra/, $(notdir $(wildcard $(srcdir)/extra/*.cpp)))
 endif
 
+# If rizon modules are enabled
+ifneq "@RIZON@" "no"
+FILES   += $(addprefix rizon/, $(notdir $(wildcard $(srcdir)/rizon/*.cpp)))
+endif
+
 include $(srcdir)/modperl/Makefile.inc
 include $(srcdir)/modpython/Makefile.inc
 include $(srcdir)/modtcl/Makefile.inc

diff --git a/modules/blockuser_mod.cpp b/modules/rizon/blockuser_mod.cpp
similarity index 100%
rename from modules/blockuser_mod.cpp
rename to modules/rizon/blockuser_mod.cpp

diff --git a/modules/cgiirc.cpp b/modules/rizon/cgiirc.cpp
similarity index 92%
rename from modules/cgiirc.cpp
rename to modules/rizon/cgiirc.cpp
index a76eccecbb9c9f69d0caf7f17df574021342e328..67df32dd0cbcaaecbab29da01876bd35f2e61ea1 100644 (file)
--- a/modules/cgiirc.cpp
+++ b/modules/rizon/cgiirc.cpp
@@ -112,6 +112,7 @@ private:
        }\r
 };\r
 \r
-CString CCgiIrcMod::m_pPass = CHANGE ME "";\r
+#error CGI::IRC module requires password to be entered at compile-time.\r
+CString CCgiIrcMod::m_pPass = "";\r
 \r
 GLOBALMODULEDEFS(CCgiIrcMod, "Provide dynamic IP spoofing to assist with user accountability.");\r

diff --git a/modules/force_local_conn.cpp b/modules/rizon/force_local_conn.cpp
similarity index 100%
rename from modules/force_local_conn.cpp
rename to modules/rizon/force_local_conn.cpp

diff --git a/modules/force_stickychan.cpp b/modules/rizon/force_stickychan.cpp
similarity index 100%
rename from modules/force_stickychan.cpp
rename to modules/rizon/force_stickychan.cpp