BUILD : 1.7.8 (753) BUGS : N/a NOTES : Merged anope-dev with trunk

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


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

1 files changed, 2 insertions, 105 deletions

diff --git a/Config b/Config
index bb4417927..c6922cd2f 100755
--- a/Config
+++ b/Config
@@ -40,7 +40,6 @@ Run_Configure () {
 WITH_BIN=""
 WITH_DATA=""
 WITH_ENC=""
-WITH_IRCD=""
 WITH_RUN=""
 WITH_PERM=""
 WITH_MYSQL=""
@@ -58,10 +57,6 @@ if [ "$ENCRYPTION" != "" ] ; then
     WITH_ENC=" --with-encryption"
 fi
 
-if [ "$IRCTYPE_DEF" != "" ] ; then
-    WITH_IRCD=" --with-ircd=$IRCTYPE_DEF"
-fi
-
 if [ "$RUNGROUP" != "" ] ; then
     WITH_RUN="  --with-rungroup=$RUNGROUP"
 fi
@@ -75,9 +70,9 @@ if [ "$MYSQL" != "yes" ] ; then
 fi
 
 
-echo "./configure $WITH_BIN $WITH_DATA $WITH_ENC $WITH_IRCD $WITH_RUN $WITH_PERM $WITH_MYSQL"
+echo "./configure $WITH_BIN $WITH_DATA $WITH_ENC $WITH_RUN $WITH_PERM $WITH_MYSQL"
 
-./configure $WITH_BIN $WITH_DATA $WITH_ENC $WITH_IRCD $WITH_RUN $WITH_PERM $WITH_MYSQL
+./configure $WITH_BIN $WITH_DATA $WITH_ENC $WITH_RUN $WITH_PERM $WITH_MYSQL
 }
 
 ECHO2SUF=''
@@ -281,104 +276,6 @@ echo ""
 
 ####
 
-ok=0
-echo "Select the closest to the type of server on your IRC network:"
-echo "    1) DreamForge 4.6.7   [dated IRCd, upgrade to a current one]"
-echo "    2) Bahamut 1.4.27     [or later]"
-echo "    3) UnrealIRCd 3.1.1   [or later (not 3.2)]"
-echo "    4) UltimateIRCd 2.8.2 [or later]"
-echo "    5) UltimateIRCd 3.0.0 [alpha26 or later]"
-echo "    6) Hybrid IRCd 7.0    [experimental]"
-echo "    7) ViagraIRCd 1.3.x   [or later]"
-echo "    8) PTlink 6.15.0      [experimental]"
-echo "    9) RageIRCd 2.0.0     [beta-6 or later]"
-echo "   10) Unreal 3.2         [Unreal 3.2 beta19 or later]"
-echo "   11) Solid IRCD 3.4.x   [Solid IRCD 3.4.6 or later]"
-echo "   12) Plexus 2.0         [or later]"
-echo "   13) Ratbox 2.0.6       [or later]"
-echo "   14) ShadowIRCD 4.0x    [beta 7 or later]"
-
-while [ $ok -eq 0 ] ; do
-        echo2 "[$IRCTYPE] "
-        if read INPUT ; then : ; else echo "" ; exit 1 ; fi
-        if [ ! "$INPUT" ] ; then
-                INPUT=$IRCTYPE
-        fi
-        case $INPUT in
-                no\ default)
-                        echo "You must specify your IRC server type in order for Services to function"
-                        echo "correctly."
-                        ;;
-                1)
-			IRCTYPE_DEF="IRC_DREAMFORGE"
-			ok=1;
-			;;
-		2)
-			IRCTYPE_DEF="IRC_BAHAMUT"
-			ok=1;
-			;;
-		3) 
-			IRCTYPE_DEF="IRC_UNREAL31"
-			ok=1;
-			;;
-		4)
-			IRCTYPE_DEF="IRC_ULTIMATE2"
-			ok=1;
-			;;
-		5)
-			IRCTYPE_DEF="IRC_ULTIMATE3"
-			ok=1;
-			;;
-		6)
-			IRCTYPE_DEF="IRC_HYBRID"
-			ok=1;
-			;;
-		7)
-			IRCTYPE_DEF="IRC_VIAGRA"
-			ok=1;
-			;;
-		8)
-			IRCTYPE_DEF="IRC_PTLINK"
-			ok=1;
-			;;
-		9)
-			IRCTYPE_DEF="IRC_RAGE2"
-			ok=1;
-			;;
-
-		10)
-			IRCTYPE_DEF="IRC_UNREAL32"
-			ok=1;
-			;;
-
-		11)
-			IRCTYPE_DEF="IRC_SOLID"
-			ok=1;
-			;;
-		12)
-			IRCTYPE_DEF="IRC_PLEXUS"
-			ok=1;
-			;;
-		13)
-			IRCTYPE_DEF="IRC_RATBOX"
-			ok=1;
-			;;
-		14)
-			IRCTYPE_DEF="IRC_SHADOWIRCD"
-			ok=1;
-			;;
-
-
-                *)
-                        echo "Please enter a valid option number."
-                        ;;
-        esac
-done
-IRCTYPE=$INPUT
-echo ""
-
-####
-
 if [ "$ENCRYPTION" = "ENCRYPT_MD5" ] ; then
         DEF=yes
 else