diff options
| author | rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-07-19 14:08:30 +0000 |
|---|---|---|
| committer | rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2004-07-19 14:08:30 +0000 |
| commit | a1479a87757fb5e9b48f3c8bb5dd9cc247406f1a (patch) | |
| tree | 06d23a51082a398c512ed8f1e39bdac60d4dd658 | |
| parent | 7fffea77edbe72cd66f7a55f41a3966204f9cf86 (diff) | |
BUILD : 1.7.4 (264) BUGS : N/A NOTES : Switched to autoconf - try to commit part 1
git-svn-id: svn://svn.anope.org/anope/trunk@264 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@169 5417fbe8-f217-4b02-8779-1006273d7864
| -rw-r--r-- | Changes | 1 | ||||
| -rwxr-xr-x | Config | 374 | ||||
| -rw-r--r-- | Makefile | 178 | ||||
| -rw-r--r-- | Makefile.in | 53 | ||||
| -rw-r--r-- | aclocal.m4 | 229 | ||||
| -rw-r--r-- | config.guess | 1360 | ||||
| -rw-r--r-- | config.sub | 1375 | ||||
| -rwxr-xr-x | configure | 11533 | ||||
| -rw-r--r-- | configure.in | 210 | ||||
| -rw-r--r-- | include/commands.h (renamed from commands.h) | 2 | ||||
| -rw-r--r-- | include/config.h (renamed from config.h) | 2 | ||||
| -rw-r--r-- | include/datafiles.h (renamed from datafiles.h) | 2 | ||||
| -rw-r--r-- | include/defs.h (renamed from defs.h) | 2 | ||||
| -rw-r--r-- | include/encrypt.h (renamed from encrypt.h) | 0 | ||||
| -rw-r--r-- | include/extern.h (renamed from extern.h) | 0 | ||||
| -rw-r--r-- | include/messages.h (renamed from messages.h) | 2 | ||||
| -rw-r--r-- | include/modules.h (renamed from modules.h) | 2 | ||||
| -rw-r--r-- | include/pseudo.h (renamed from pseudo.h) | 0 | ||||
| -rw-r--r-- | include/services.h (renamed from services.h) | 13 | ||||
| -rw-r--r-- | include/slist.h (renamed from slist.h) | 2 | ||||
| -rw-r--r-- | include/sysconf.h.in | 209 | ||||
| -rw-r--r-- | include/timeout.h (renamed from timeout.h) | 2 | ||||
| -rw-r--r-- | include/version.sh (renamed from version.sh) | 0 | ||||
| -rw-r--r-- | install.sh | 0 | ||||
| -rw-r--r-- | lang/Makefile | 7 | ||||
| -rw-r--r-- | modules/Makefile | 26 | ||||
| -rw-r--r-- | src/Makefile | 107 | ||||
| -rw-r--r-- | src/actions.c (renamed from actions.c) | 0 | ||||
| -rwxr-xr-x | src/bin/am (renamed from bin/am) | 0 | ||||
| -rwxr-xr-x | src/bin/anoperc (renamed from bin/anoperc) | 0 | ||||
| -rwxr-xr-x | src/bin/cp-recursive (renamed from bin/cp-recursive) | 0 | ||||
| -rwxr-xr-x | src/bin/langtool (renamed from bin/langtool) | 0 | ||||
| -rwxr-xr-x | src/bin/mydbgen (renamed from bin/mydbgen) | 0 | ||||
| -rwxr-xr-x | src/bin/register (renamed from bin/register) | 0 | ||||
| -rw-r--r-- | src/botserv.c (renamed from botserv.c) | 0 | ||||
| -rw-r--r-- | src/channels.c (renamed from channels.c) | 0 | ||||
| -rw-r--r-- | src/chanserv.c (renamed from chanserv.c) | 0 | ||||
| -rw-r--r-- | src/commands.c (renamed from commands.c) | 0 | ||||
| -rw-r--r-- | src/compat.c (renamed from compat.c) | 0 | ||||
| -rw-r--r-- | src/config.c (renamed from config.c) | 0 | ||||
| -rw-r--r-- | src/converter.c (renamed from converter.c) | 0 | ||||
| -rw-r--r-- | src/datafiles.c (renamed from datafiles.c) | 0 | ||||
| -rw-r--r-- | src/encrypt.c (renamed from encrypt.c) | 0 | ||||
| -rw-r--r-- | src/helpserv.c (renamed from helpserv.c) | 0 | ||||
| -rw-r--r-- | src/hostserv.c (renamed from hostserv.c) | 0 | ||||
| -rw-r--r-- | src/init.c (renamed from init.c) | 0 | ||||
| -rw-r--r-- | src/language.c (renamed from language.c) | 0 | ||||
| -rw-r--r-- | src/list.c (renamed from list.c) | 0 | ||||
| -rw-r--r-- | src/log.c (renamed from log.c) | 0 | ||||
| -rw-r--r-- | src/mail.c (renamed from mail.c) | 0 | ||||
| -rw-r--r-- | src/main.c (renamed from main.c) | 0 | ||||
| -rw-r--r-- | src/memory.c (renamed from memory.c) | 0 | ||||
| -rw-r--r-- | src/memoserv.c (renamed from memoserv.c) | 0 | ||||
| -rw-r--r-- | src/messages.c (renamed from messages.c) | 0 | ||||
| -rw-r--r-- | src/misc.c (renamed from misc.c) | 0 | ||||
| -rw-r--r-- | src/modules.c (renamed from modules.c) | 8 | ||||
| -rw-r--r-- | src/modules/Makefile | 32 | ||||
| -rw-r--r-- | src/modules/README (renamed from modules/README) | 0 | ||||
| -rwxr-xr-x | src/modules/compile.sh (renamed from modules/compile.sh) | 0 | ||||
| -rwxr-xr-x | src/modules/configure (renamed from modules/configure) | 0 | ||||
| -rw-r--r-- | src/modules/hs_moo.c (renamed from modules/hs_moo.c) | 0 | ||||
| -rw-r--r-- | src/modules/ircd_catserv.c (renamed from modules/ircd_catserv.c) | 0 | ||||
| -rw-r--r-- | src/modules/module.h (renamed from modules/module.h) | 0 | ||||
| -rw-r--r-- | src/mysql.c (renamed from mysql.c) | 0 | ||||
| -rw-r--r-- | src/news.c (renamed from news.c) | 0 | ||||
| -rw-r--r-- | src/nickserv.c (renamed from nickserv.c) | 0 | ||||
| -rw-r--r-- | src/operserv.c (renamed from operserv.c) | 0 | ||||
| -rw-r--r-- | src/process.c (renamed from process.c) | 0 | ||||
| -rw-r--r-- | src/protocol.c (renamed from protocol.c) | 0 | ||||
| -rw-r--r-- | src/proxy.c (renamed from proxy.c) | 4 | ||||
| -rw-r--r-- | src/rdb.c (renamed from rdb.c) | 0 | ||||
| -rw-r--r-- | src/send.c (renamed from send.c) | 0 | ||||
| -rw-r--r-- | src/servers.c (renamed from servers.c) | 0 | ||||
| -rw-r--r-- | src/sessions.c (renamed from sessions.c) | 0 | ||||
| -rw-r--r-- | src/slist.c (renamed from slist.c) | 0 | ||||
| -rw-r--r-- | src/sockutil.c (renamed from sockutil.c) | 0 | ||||
| -rw-r--r-- | src/timeout.c (renamed from timeout.c) | 0 | ||||
| -rw-r--r-- | src/users.c (renamed from users.c) | 0 | ||||
| -rw-r--r-- | src/vsnprintf.c (renamed from vsnprintf.c) | 0 | ||||
| -rw-r--r-- | version.log | 6 |
80 files changed, 13691 insertions, 2050 deletions
@@ -1,6 +1,7 @@ Anope Version S V N ------------------- Provided by Anope Dev. <dev@anope.org> - 2004 +07/17 A Switched to autoconf for configure script. [ #00] 07/05 A Warning when LocalAddress conflicts with RemoteServer. [#118] 06/18 A Added proper Bahamut1.8 support. [ #55] 07/15 F Fixed the bug where /ns release didn't work with UseSVSHOLD. [#125] @@ -0,0 +1,374 @@ +#!/bin/sh +# +# Configuration script for Services. +# +# Anope (c) 2003 Anope team +# Contact us at dev@anope.org +# +# This program is free but copyrighted software; see the file COPYING for +# details. +# +# Based on the original code of Epona by PegSoft. +# Based on the original code of Services by Andy Church. +# +########################################################################### + +echo2 () { + $ECHO2 "$*$ECHO2SUF" # these are defined later +} + +ECHO2SUF='' +if [ "`echo -n a ; echo -n b`" = "ab" ] ; then + ECHO2='echo -n' +elif [ "`echo 'a\c' ; echo 'b\c'`" = "ab" ] ; then + ECHO2='echo' ; ECHO2SUF='\c' +elif [ "`printf 'a' 2>&1 ; printf 'b' 2>&1`" = "ab" ] ; then + ECHO2='printf "%s"' +else + # oh well... + ECHO2='echo' +fi +export ECHO2 ECHO2SUF + +exists () { # because some shells don't have test -e + if [ -f $1 -o -d $1 -o -p $1 -o -c $1 -o -b $1 ] ; then + return 0 + else + return 1 + fi +} + +########################################################################### +# Init values +########################################################################### + +BINDEST=$HOME/services +DATDEST=$HOME/services +RUNGROUP= +UMASK= +IRCTYPE="no default" +ENCRYPTION= + +########################################################################### +# Load the cache +########################################################################### +if [ -f config.cache -a -r config.cache -a ! "$IGNORE_CACHE" ] ; then +cat <<EOT + Using defaults from config.cache. To ignore, rm config.cache +EOT +. config.cache +fi + +########################################################################### + +echo "" +echo "-========================= A N O P E ==========================-" +echo "For more detailed information on the features of Anope1.7 please" +echo "read the self-named documentation found on the 'docs' directory." +echo "" + +echo "Anope is a set of IRC Service expanded upon Lara's Epona, based" +echo "on Andy Church's IRC Services. For all your Anope needs please" +echo "visit our portal at http://www.anope.org/" +echo "" + +echo "Please read the INSTALL file for install/upgrade instructions." +echo "Reading the FAQ and README files would be a good idea too. (all" +echo "documentation is located on directory 'docs')." +echo "-==============================================================-" +echo "" +echo "Beginning Services configuration." +echo "" + +########################################################################### + +# Ask the user anything we need to know ahead of time. + +export ok INPUT + +#### + +ok=0 +echo "Note: press Return for the default, or enter a new value." +echo "In what directory do you want the binaries to be installed?" +while [ $ok -eq 0 ] ; do + echo2 "[$BINDEST] " + if read INPUT ; then : ; else echo "" ; exit 1 ; fi + if [ ! "$INPUT" ] ; then + INPUT=$BINDEST + fi + if [ ! -d "$INPUT" ] ; then + if exists "$INPUT" ; then + echo "$INPUT exists, but is not a directory!" + else + echo "$INPUT does not exist. Create it?" + echo2 "[y] " + read YN + if [ "$YN" != "n" ] ; then + if mkdir -p $INPUT ; then + ok=1 + fi + fi + fi + elif exists "$INPUT/include/services.h" ; then + echo "You cannot use the Services source directory as a target directory." + else + ok=1 + fi +done +BINDEST=$INPUT +DATDEST=$INPUT +echo "" + + +#### + +ok=0 +echo "Where do you want the data files to be installed?" +while [ $ok -eq 0 ] ; do + echo2 "[$DATDEST] " + if read INPUT ; then : ; else echo "" ; exit 1 ; fi + if [ ! "$INPUT" ] ; then + INPUT=$DATDEST + fi + if [ ! -d "$INPUT" ] ; then + if exists "$INPUT" ; then + echo "$INPUT exists, but is not a directory!" + else + echo "$INPUT does not exist. Create it?" + echo2 "[y] " + read YN + if [ "$YN" != "n" ] ; then + if mkdir -p $INPUT ; then + ok=1 + fi + fi + fi + elif exists "$INPUT/include/services.h" ; then + echo "You cannot use the Services source directory as a target directory." + else + ok=1 + fi +done +DATDEST=$INPUT +echo "" + +#### + + +OLD_RUNGROUP="$RUNGROUP" +if [ "$RUNGROUP" ] ; then + echo "Which group should all Services data files be owned by? (If Services" + echo "should not force files to be owned by a particular group, type "\"none\" + echo "(without the quotes) and press Return.)" +else + echo "Which group should all Services data files be owned by? (If Services" + echo "should not force files to be owned by a particular group, just press" + echo "Return.)" +fi +echo2 "[$RUNGROUP] " +if read INPUT ; then : ; else echo "" ; exit 1 ; fi +if [ "$INPUT" ] ; then + if [ "$INPUT" = "none" ] ; then + RUNGROUP="" + else + RUNGROUP="$INPUT" + fi +fi +echo "" + +#### + +if [ ! "$UMASK" -o "$RUNGROUP" != "$OLD_RUNGROUP" ] ; then + if [ "$RUNGROUP" ] ; then + UMASK=007 + else + UMASK=077 + fi +fi + +ok=0 +echo "What should the default umask for data files be (in octal)?" +echo "(077 = only accessible by owner; 007 = accessible by owner and group)" +while [ $ok -eq 0 ] ; do + echo2 "[$UMASK] " + if read INPUT ; then : ; else echo "" ; exit 1 ; fi + if [ ! "$INPUT" ] ; then + INPUT=$UMASK + fi + if [ `echo "$INPUT" | grep -c '[^0-7]'` -gt 0 ] ; then + echo "$UMASK is not a valid octal number!" + else + if [ "`echo $INPUT | cut -c1`" != "0" ] ; then + INPUT=0$INPUT + fi + ok=1 + fi +done +UMASK=$INPUT +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]" +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 [beta-3 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_UNREAL" + ok=1; + ;; + 4) + IRCTYPE_DEF="IRC_ULTIMATE" + 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; + ;; + + *) + echo "Please enter a valid option number." + ;; + esac +done +IRCTYPE=$INPUT +echo "" + +#### + +if [ "$ENCRYPTION" = "ENCRYPT_MD5" ] ; then + DEF=yes +else + DEF=no +fi + +ok=0 +echo "Do you want to use the MD5 message-digest algorithm to encrypt passwords?" +echo "(Selecting "\"yes\"" protects your passwords from being stolen if someone" +echo "gains access to the Services databases, but makes it impossible to recover" +echo "forgotten passwords. There is no way to reverse this operation, so make" +echo "sure you really want to enable it.)" +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*) + ENCRYPTION= + ok=1 + ;; + y*|Y*) + ENCRYPTION=ENCRYPT_MD5 + ok=1 + ;; + *) + echo "Please enter 'yes' or 'no'." + ;; + esac +done +echo "" + +#### + + +################################################################################ +# Store values +################################################################################ +echo2 "Saving configuration results in config.cache... " + +cat <<EOT >config.cache +BINDEST="$BINDEST" +DATDEST="$DATDEST" +RUNGROUP="$RUNGROUP" +UMASK=$UMASK +IRCTYPE=$IRCTYPE +IRCTYPE_DEF="$IRCTYPE_DEF" +ENCRYPTION="$ENCRYPTION" +EOT +echo "done." + + +################################################################################ +# Build the configure string +################################################################################ + +WITH_BIN="" +WITH_DATA="" +WITH_ENC="" +WITH_IRCD="" +WITH_RUN="" +WITH_PERM="" + +if [ "$BINDEST" != "" ] ; then + WITH_BIN=" --with-bindir=$BINDEST" + WITH_DATA=" --with-datadir=$DATDEST" +fi + +if [ "$DATDEST" != "" ] ; then + WITH_DATA=" --with-datadir=$DATDEST" +fi + +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 + +if [ "$UMASK" != "" ] ; then + WITH_PERM=" --with-permissions=$UMASK" +fi + +./configure $WITH_BIN $WITH_DATA $WITH_ENC $WITH_IRCD $WITH_RUN $WITH_PERM + diff --git a/Makefile b/Makefile deleted file mode 100644 index a431d673d..000000000 --- a/Makefile +++ /dev/null @@ -1,178 +0,0 @@ -# Makefile for Epona. -# -# Epona (c) 2000-2002 PegSoft -# Contact us at epona@pegsoft.net -# -# This program is free but copyrighted software; see the file COPYING for -# details. -# -# Based on the original code of Services by Andy Church. - -include Makefile.inc - -########################################################################### -########################## Configuration section ########################## - -# Note that changing any of these options (or, in fact, anything in this -# file) will automatically cause a full rebuild of Services. - -# Compilation options: -# -DCLEAN_COMPILE Attempt to compile without any warnings (note that -# this may reduce performance) -# -DSTREAMLINED Leave out "fancy" options to enhance performance - -CDEFS = - -# Add any extra flags you want here. The default line enables warnings and -# debugging symbols on GCC. If you have a non-GCC compiler, you may want -# to comment it out or change it. - -MORE_CFLAGS = -Wall -g - - -######################## End configuration section ######################## -########################################################################### - - -CFLAGS = $(CDEFS) $(BASE_CFLAGS) $(MORE_CFLAGS) - - -OBJS = actions.o botserv.o channels.o chanserv.o commands.o compat.o converter.o \ - config.o datafiles.o encrypt.o helpserv.o hostserv.o init.o language.o list.o log.o mail.o main.o \ - memory.o memoserv.o messages.o misc.o modules.o news.o nickserv.o operserv.o \ - process.o protocol.o proxy.o send.o servers.o sessions.o slist.o sockutil.o \ - timeout.o users.o \ - $(VSNPRINTF_O) $(RDB_O) $(MYSQL_O) -SRCS = actions.c botserv.c channels.c chanserv.c commands.c compat.c converter.c \ - config.c datafiles.c encrypt.c helpserv.c hostserv.c init.c language.c list.c log.c mail.c main.c \ - memory.c memoserv.c messages.c misc.c modules.c news.c nickserv.c operserv.c \ - process.c protocol.c proxy.c send.c servers.c sessions.c slist.c sockutil.c \ - timeout.c users.c \ - $(VSNPRINTF_C) $(RDB_C) $(MYSQL_C) - -.c.o: - $(CC) $(CFLAGS) -c $< - - -all: $(PROGRAM) languages modules - @echo Now run \"$(MAKE) install\" to install Services. - -myclean: - rm -f *.o $(PROGRAM) a.out - - -clean: myclean - (cd lang ; $(MAKE) spotless) - rm -f language.h - (cd modules ; $(MAKE) clean) - -spotless: myclean - (cd lang ; $(MAKE) spotless) - (cd modules ; rm -f *.so Makefile.inc) - rm -f config.cache configure.log sysconf.h Makefile.inc language.h version.h *~ - -distclean: spotless - -install: $(PROGRAM) languages - $(INSTALL) services $(BINDEST)/services - $(INSTALL) bin/anoperc $(BINDEST)/anoperc - rm -f $(BINDEST)/listnicks $(BINDEST)/listchans - ln $(BINDEST)/services $(BINDEST)/listnicks - ln $(BINDEST)/services $(BINDEST)/listchans - (cd lang ; $(MAKE) install) - $(CP_ALL) data/* $(DATDEST) - test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups - test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs - @if [ "$(MODULE_PATH)" ] ; then \ - (cd modules ; $(MAKE) install) ; \ - fi - @if [ "$(RUNGROUP)" ] ; then \ - echo chgrp -R $(RUNGROUP) $(DATDEST) ; \ - chgrp -R $(RUNGROUP) $(DATDEST) ; \ - echo chmod -R g+rw $(DATDEST) ; \ - chmod -R g+rw $(DATDEST) ; \ - echo find $(DATDEST) -type d -exec chmod g+xs \'\{\}\' \\\; ; \ - find $(DATDEST) -type d -exec chmod g+xs '{}' \; ; \ - fi - @echo "" - @echo "Don't forget to create/update your services.conf file! See" - @echo "the README for details." - @echo "" - -########################################################################### - -$(PROGRAM): version.h $(OBJS) - $(CC) $(LFLAGS) $(OBJS) $(LIBS) $(MLIBS) -o $@ $(ELIBS) - -languages: FRC |
