BUILD : 1.7.5 (355) BUGS : N/A NOTES : An option to not detect mysql has been added to ./Config

git-svn-id: svn://svn.anope.org/anope/trunk@355 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@231 5417fbe8-f217-4b02-8779-1006273d7864

6 files changed, 66 insertions, 11 deletions

diff --git a/Changes b/Changes
index 2614e4124..1ba0dd979 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,7 @@ Provided by Anope Dev. <dev@anope.org> - 2004
 09/20 A Added RestrictOperNicks as new feature in services.conf.          [ #00]
 09/08 A Removed rand() and ported bsd's arc4random() to fit our needs.    [ #00]
 08/24 A New -l option for am script to list possible selectors.           [ #00]
+09/21 F An option to explicitly not use mysql is added to Config          [ #00]
 09/19 F Rewrote the internals of moduleData to save lots of memory.       [ #00]
 09/17 F Fixed MySQL error, whereby checks are only done if mysql is on.   [ #00]
 09/14 F Fixed /os MODE by joining nested ifs into one.                    [ #00]
diff --git a/Config b/Config
index 51ff6ae9c..990a70335 100755
--- a/Config
+++ b/Config
@@ -324,6 +324,35 @@ echo ""
 
 ####
 
+ok=0
+DEF=yes
+echo "Allow anope to automatically check for mysql libaries?"
+echo "unless you get errors with make, there is no need to"
+echo "change this setting."
+while [ $ok -eq 0 ] ; do
+        echo2 "[$DEF] "
+        if read INPUT ; then : ; else echo "" ; exit 1 ; fi
+        if [ ! "$INPUT" ] ; then
+                INPUT=$DEF
+        fi
+        case $INPUT in
+                n*|N*)
+			MYSQL=
+			ok=1
+			;;
+                y*|Y*)
+			MYSQL="yes"
+			ok=1
+			;;
+                *)
+                        echo "Please enter 'yes' or 'no'."
+                        ;;
+        esac
+done
+echo ""
+
+####
+
 
 ################################################################################
 # Store values
@@ -338,6 +367,7 @@ UMASK=$UMASK
 IRCTYPE=$IRCTYPE
 IRCTYPE_DEF="$IRCTYPE_DEF"
 ENCRYPTION="$ENCRYPTION"
+MYSQL="$MYSQL"
 EOT
 echo "done."
 
@@ -352,6 +382,7 @@ WITH_ENC=""
 WITH_IRCD=""
 WITH_RUN=""
 WITH_PERM=""
+WITH_MYSQL=""
 
 if [ "$BINDEST" != "" ] ; then 
     WITH_BIN=" --with-bindir=$BINDEST"
@@ -378,8 +409,12 @@ if [ "$UMASK" != "" ] ; then
     WITH_PERM=" --with-permissions=$UMASK"
 fi
 
+if [ "$MYSQL" != "yes" ] ; then
+    WITH_MYSQL=" --without-mysql"
+fi
+
 
-echo "./configure $WITH_BIN $WITH_DATA $WITH_ENC $WITH_IRCD $WITH_RUN $WITH_PERM"
+echo "./configure $WITH_BIN $WITH_DATA $WITH_ENC $WITH_IRCD $WITH_RUN $WITH_PERM $WITH_MYSQL"
 
-./configure $WITH_BIN $WITH_DATA $WITH_ENC $WITH_IRCD $WITH_RUN $WITH_PERM
+./configure $WITH_BIN $WITH_DATA $WITH_ENC $WITH_IRCD $WITH_RUN $WITH_PERM $WITH_MYSQL
 
diff --git a/configure b/configure
index a98e72681..bc240754b 100755
--- a/configure
+++ b/configure
@@ -844,6 +844,7 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+ --without-mysql     Do not use MySQL even if we find it
   --with-mysqlclient-prefix=PFX Prefix where mysqlclient is
 installed
   --with-mysqlclient-include=DIR Directory pointing
@@ -2742,6 +2743,13 @@ fi
 x="0";
 DIS_MYSQL="  MySql: No"
 
+# Check whether --with-mysql or --without-mysql was given.
+if test "${with_mysql+set}" = set; then
+  withval="$with_mysql"
+
+else
+
+
 
 # Check whether --with-mysqlclient-prefix or --without-mysqlclient-prefix was given.
 if test "${with_mysqlclient_prefix+set}" = set; then
@@ -2936,6 +2944,7 @@ if test "$x" = "1"; then
         DIS_MYSQL="  MySql: Yes"
 fi
 
+fi;
 
 DIS_THREAD="Threads: No"
 ac_aux_dir=
@@ -4134,7 +4143,7 @@ fi
 
 
 
-DIS_MODULES="Modules: NO"
+DIS_MODULES="Modules: Yes"
 
 
 
@@ -4316,6 +4325,7 @@ cat >>confdefs.h <<\_ACEOF
 #define STATIC_LINKING "NO_MODULES"
 _ACEOF
 
+  DIS_MODULES="Modules: No"
 
 fi
 
diff --git a/configure.in b/configure.in
index 63f99fbe1..5213e8151 100644
--- a/configure.in
+++ b/configure.in
@@ -44,6 +44,7 @@ AC_CHECK_LIB(resolv, res_query,ANOPELIBS="$ANOPELIBS-lresolv ")
 AC_CHECK_LIB(bsd, revoke,ANOPELIBS="$ANOPELIBS-lbsd ")
 x="0";
 DIS_MYSQL="  MySql: No"
+AC_ARG_WITH(mysql, [ --without-mysql     Do not use MySQL even if we find it],,[ 
 AM_PATH_MYSQLCLIENT(,[
 	AC_DEFINE_UNQUOTED(USE_MYSQL,1,"Use Mysql")
 	AC_DEFINE_UNQUOTED(USE_RDB,1,"Use RDB")
@@ -60,7 +61,7 @@ if test "$x" = "1"; then
 	LDFLAGS="$LDFLAGS $MYSQLCLIENT_LDFLAGS "
         DIS_MYSQL="  MySql: Yes"
 fi
-
+])
 
 DIS_THREAD="Threads: No"
 ACX_PTHREAD([
@@ -75,7 +76,7 @@ AC_SUBST(LDFLAGS)
 
 AC_CHECK_HEADER(sys/types.h,AC_DEFINE(HAS_SYS_TYPES_H,1,"Has sys/types.h"))
 
-DIS_MODULES="Modules: NO"
+DIS_MODULES="Modules: Yes"
 
 dnl module checking based on Unreal's module checking code
 AC_DEFUN(AC_ENABLE_DYN,
@@ -89,6 +90,7 @@ AC_CHECK_FUNC(dlopen,, AC_CHECK_LIB(dl,dlopen,[
 [
 AC_MSG_WARN(Dynamic linking is not enabled because dlopen was not found)
 AC_DEFINE(STATIC_LINKING,"NO_MODULES","modules not available")
+  DIS_MODULES="Modules: No"
 ]))
 
 hold_cflags=$CFLAGS
diff --git a/src/nickserv.c b/src/nickserv.c
index 932a1b82f..d3232e9f1 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -1980,19 +1980,22 @@ static int do_register(User * u)
     if (RestrictOperNicks) {
         for (i = 0; i < RootNumber; i++) {
             if (strstr(u->nick, ServicesRoots[i]) && !is_oper(u)) {
-                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick);
+                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+                            u->nick);
                 return MOD_CONT;
             }
         }
-        for (i = 0; i < servadmins.count && (nc = servadmins.list[i]);i++) {
+        for (i = 0; i < servadmins.count && (nc = servadmins.list[i]); i++) {
             if (strstr(u->nick, nc->display) && !is_oper(u)) {
-                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick);
+                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+                            u->nick);
                 return MOD_CONT;
             }
         }
-        for (i = 0; i < servopers.count && (nc = servopers.list[i]);i++) {
+        for (i = 0; i < servopers.count && (nc = servopers.list[i]); i++) {
             if (strstr(u->nick, nc->display) && !is_oper(u)) {
-                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick);
+                notice_lang(s_NickServ, u, NICK_CANNOT_BE_REGISTERED,
+                            u->nick);
                 return MOD_CONT;
             }
         }
diff --git a/version.log b/version.log
index 91701ecb4..ece6c34a2 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="5"
-VERSION_BUILD="354"
+VERSION_BUILD="355"
 
 # $Log$
 #
+# BUILD : 1.7.5 (355)
+# BUGS  : N/A
+# NOTES : An option to not detect mysql has been added to ./Config
+#
 # BUILD : 1.7.5 (354)
 # BUGS  : 
 # NOTES : Added RestrictOpernicks by request. Small feature.