[IRC-Dev CVS] Module ircdh: Change commited ircdh/config Configure.in,1.1.1.1,1.2 config-sh.in,1.4,1
Brought to you by:
zolty
Menu
▾
▴
[IRC-Dev CVS] Module ircdh: Change commited ircdh/config Configure.in,1.1.1.1,1.2 config-sh.in,1.4,1.5 configure,1.1.1.1,1.2 configure.in,1.1.1.1,1.2 setup.h.in,1.1.1.1,1.2
|
From: Zolty <zo...@us...> - 2002-08-18 22:49:44
|
Update of /cvsroot/irc-dev/ircdh/config
In directory usw-pr-cvs1:/tmp/cvs-serv31134/ircdh/config
Modified Files:
Configure.in config-sh.in configure configure.in setup.h.in
Log Message:
2002-08-19 Toni Garcia <zo...@ir...>
* ircd/Makefile.in: Se hace una renovacion del archivo, preparandolo para
agregar nuevos .c de una manera facil. Es conveniente hacer "make depend"
de vez en cuando.
* ircd/ircd_log.c: Nuevo sistema de logs del ircd. Esta incompleto. Esta
pendiente de ir migrando todos los mensajes.
* ircd/ircd_signal.c: Se mueve el codigo de gestion de "signals" de POSIX
del ircd.c al nuevo archivo.
* ircd/os_*.c: Se agregan las librerias de Thomas Helvey para los defines
y funciones segun el sistema operativo. Esto es bueno para el dia que
se haga un port de WIN32/WIN64 que se crea un os_windows.c y asi se permite
hacer el port con minimos cambios. Aun no esta completo del todo.
* /*: Nuevos ficheros README, TODO, del ircu de undernet, hay que personalizarlo.
Se actualizan los ChangeLog's.
* config/*: Se actualizan los configures y makefiles. Se agregan 2 preguntas
en el make config nuevas:
KILL_IPMISMATCH: 'Kill connecting clients when forward and reverse DNS mismatch'
OPER_WALLOPS: 'Allow opers to wallop'
Pero aun no estan implementadas.
Index: Configure.in
===================================================================
RCS file: /cvsroot/irc-dev/ircdh/config/Configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Configure.in 26 Jul 2002 21:58:22 -0000 1.1.1.1
+++ Configure.in 18 Aug 2002 22:49:41 -0000 1.2
@@ -477,6 +477,11 @@
echo "/*" > $CONFIG_H
echo " * Automatically generated C config: don't edit" >> $CONFIG_H
echo " */" >> $CONFIG_H
+echo "#ifndef INCLUDED_config_h" >> $CONFIG_H
+echo "#define INCLUDED_config_h" >> $CONFIG_H
+echo "#ifndef INCLUDED_setup_h" >> $CONFIG_H
+echo "#include \"setup.h\"">> $CONFIG_H
+echo "#endif" >> $CONFIG_H
echo "#define AUTOCONF_INCLUDED" >> $CONFIG_H
CONFIG_IN=./config-sh
@@ -509,6 +514,8 @@
fi
. $CONFIG_IN
+
+echo "#endif /* INCLUDED_config_h */" >> $CONFIG_H
mv $CONFIG_H config.h
$RM -f .config.old
Index: config-sh.in
===================================================================
RCS file: /cvsroot/irc-dev/ircdh/config/config-sh.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config-sh.in 15 Aug 2002 20:55:23 -0000 1.4
+++ config-sh.in 18 Aug 2002 22:49:41 -0000 1.5
@@ -58,6 +58,21 @@
endmenu
mainmenu_option next_comment
+comment 'Debugging (do not define this on production servers)'
+ bool 'Do you want to enable debugging output' DEBUGMODE
+ bool 'Do you want to enable asserts and memory allocation checking' CONFIG_NDEBUG
+ EXTRA_CPPFLAGS=""
+ if [ "$CONFIG_NDEBUG" = "n" ]; then
+ if [ -z "$EXTRA_CPPFLAGS" ]; then
+ EXTRA_CPPFLAGS="-DNDEBUG"
+ else
+ EXTRA_CPPFLAGS="-DNDEBUG $EXTRA_CPPFLAGS"
+ fi
+ fi
+ bool 'Are you testing on a host without DNS' NODNS
+endmenu
+
+mainmenu_option next_comment
comment 'Compile stuff'
if [ "$prefix" = "NONE" ]; then
prefix=/usr/local
@@ -111,7 +126,6 @@
if [ "$IRCDLIBS" = "none" ]; then
IRCDLIBS=""
fi
- EXTRA_CPPFLAGS=""
if [ -n "$EXTRA_INCLUDEDIRS" ]; then
for i in $EXTRA_INCLUDEDIRS; do
if [ -z "$EXTRA_CPPFLAGS" ]; then
@@ -122,9 +136,9 @@
done
fi
if [ -z "$EXTRA_CPPFLAGS" ]; then
- CPPFLAGS=-I../include
+ CPPFLAGS="-I../include -I../config"
else
- CPPFLAGS="-I../include $EXTRA_CPPFLAGS"
+ CPPFLAGS="-I../include -I../config $EXTRA_CPPFLAGS"
fi
echo "EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >>$CONFIG
echo "CPPFLAGS=\"$CPPFLAGS\"" >>$CONFIG
@@ -172,7 +186,6 @@
echo " SECURITY: Then don't install the daemon SUID or SGID !"
fi
fi
- bool 'Set up a Unix domain socket to connect clients/servers' UNIXPORT
bool 'Do you need virtual hosting' VIRTUAL_HOST
PREV_HUB=$HUB
bool 'Will you connect to more then one server at a time' HUB
@@ -181,30 +194,6 @@
fi
endmenu
-mainmenu_option next_comment
-comment 'Debugging (do not define this on production servers)'
- bool 'Do you want to enable debugging output' DEBUGMODE
- bool 'Do you want memory- allocation and/or leak checking' DEBUGMALLOC
- if [ "$DEBUGMALLOC" = "y" ]; then
- bool 'Do you want to have boundary checking' MEMMAGICNUMS
- bool 'Do you want memory leak testing (stats M)' MEMLEAKSTATS y
- if [ "$MEMLEAKSTATS" = "y" ]; then
- if [ "$MEMMAGICNUMS" = "y" ]; then
- echo "You will have extra info on allocated sizes too (MEMSIZESTATS)"
- define_bool MEMSIZESTATS $MEMSIZESTATS
- else
- bool 'Do you want extra info on allocated sizes' MEMSIZESTATS y
- fi
- bool 'Do you want support for a time interval with /stats M' MEMTIMESTATS y
- fi
- else
- define_bool MEMMAGICNUMS $MEMMAGICNUMS
- define_bool MEMLEAKSTATS $MEMLEAKSTATS
- define_bool MEMSIZESTATS $MEMSIZESTATS
- define_bool MEMTIMESTATS $MEMTIMESTATS
- fi
- bool 'Are you testing on a host without DNS' NODNS
-endmenu
mainmenu_option next_comment
comment 'Paths and files'
@@ -310,6 +299,7 @@
int 'Max receive queue for clients (bytes)' CLIENT_FLOOD 2048
int 'Maximum number of network connections (23 - (FD_SETSIZE-4))' MAXCONNECTIONS 252
int 'Default client listen port' PORTNUM 6667
+# int 'Default port for connections to other servers' SERVER_PORT 4400
int 'Nickname history length' NICKNAMEHISTORYLENGTH 800
bool 'Allow Opers to see (dis)connects of local clients' ALLOW_SNO_CONNEXIT
if [ "$ALLOW_SNO_CONNEXIT" = "y" ]; then
@@ -325,10 +315,12 @@
fi
bool 'Do you want support for the old I:*:ONE:*:: construct (read help text!)' USEONE n
bool 'Send a short message instead of the MOTD to connecting clients' NODEFAULTMOTD y
+ bool 'Kill connecting clients when forward and reverse DNS mismatch' KILL_IPMISMATCH n
endmenu
mainmenu_option next_comment
comment 'Oper commands'
+ bool 'Allow opers to wallop' OPER_WALLOPS
bool 'Allow (local) Opers to see all local invisible users' SHOW_INVISIBLE_USERS y
if [ "$SHOW_INVISIBLE_USERS" = "y" ]; then
bool 'Allow Opers to see all invisible users' SHOW_ALL_INVISIBLE_USERS y
@@ -357,6 +349,7 @@
bool 'Allow local/global opers to set modes on local channels' OPER_MODE_LCHAN y
bool 'Allow local/global opers to walk through local channels modes' OPER_WALK_THROUGH_LMODES n
bool 'Prevent local/global opers from being kicked or deoped on local channels' NO_OPER_DEOP_LCHAN n
+
endmenu
mainmenu_option next_comment
@@ -402,11 +395,6 @@
# bool 'HISPANO/ESNET: ZLIB compression between servers - ESNET' ZLIB_ESNET y
# fi
int 'Max auto connects per class (1!)' MAXIMUM_LINKS 1
- echo '* Never define this on a production server:'
- bool 'Enable message logging' MSGLOG_ENABLED
- if [ "$MSGLOG_ENABLED" = "y" ]; then
- int 'Message log size' MSGLOG_SIZE 128
- fi
if [ "$OPER_KILL" = "y" ]; then
bool 'Only allow KILLs of local clients' LOCAL_KILL_ONLY
else
Index: configure
===================================================================
RCS file: /cvsroot/irc-dev/ircdh/config/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure 26 Jul 2002 21:58:23 -0000 1.1.1.1
+++ configure 18 Aug 2002 22:49:41 -0000 1.2
@@ -769,185 +769,11 @@
fi
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:774: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
[...1950 lines suppressed...]
+
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@@ -3703,7 +2984,6 @@
s%@mandir@%$mandir%g
s%@CC@%$CC%g
s%@CPP@%$CPP%g
-s%@LIBOBJS@%$LIBOBJS%g
s%@AWK@%$AWK%g
s%@SET_MAKE@%$SET_MAKE%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
@@ -3716,6 +2996,7 @@
s%@ac_cv_header_poll_h@%$ac_cv_header_poll_h%g
s%@ac_cv_header_syslog_h@%$ac_cv_header_syslog_h%g
s%@unet_cv_func_poll_syscall@%$unet_cv_func_poll_syscall%g
+s%@OSDEP_C@%$OSDEP_C%g
CEOF
EOF
Index: configure.in
===================================================================
RCS file: /cvsroot/irc-dev/ircdh/config/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure.in 26 Jul 2002 21:58:23 -0000 1.1.1.1
+++ configure.in 18 Aug 2002 22:49:41 -0000 1.2
@@ -22,10 +22,9 @@
dnl UNIX Variants
dnl Allow the use of BSD functions on AIX.
-AC_AIX
+dnl AC_AIX
dnl Allow the use of POSIX functions on several OS.
-AC_ISC_POSIX
-AC_MINIX
+dnl AC_ISC_POSIX
dnl ANSIfy the C compiler whenever possible.
AM_PROG_CC_STDC
dnl Use -O3 instead of -O2.
@@ -50,11 +49,9 @@
dnl Checks for header files.
AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(malloc.h sys/malloc.h fcntl.h string.h strings.h sys/file.h sys/ioctl.h sys/time.h syslog.h unistd.h memory.h errno.h net/errno.h sys/cdefs.h)
dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
+dnl AC_C_CONST
AC_C_BIGENDIAN
AC_TYPE_SIZE_T
AC_HEADER_TIME
@@ -68,15 +65,9 @@
unet_DEFINE_TIME_T_FMT
dnl Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MEMCMP
-AC_FUNC_SETVBUF_REVERSED
-AC_TYPE_SIGNAL
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(strchr memcpy memmove)
-AC_CHECK_FUNCS(gethostname gettimeofday mkdir strerror strtoken)
-AC_CHECK_FUNCS(select socket uname)
-AC_CHECK_FUNCS(setrlimit inet_netof getrusage times res_init)
+dnl AC_PROG_GCC_TRADITIONAL
+dnl AC_FUNC_MEMCMP
+dnl AC_FUNC_VPRINTF
dnl Do we have a system call poll?
unet_FUNC_POLL_SYSCALL
@@ -116,6 +107,33 @@
AC_SUBST(ac_cv_header_poll_h)
AC_SUBST(ac_cv_header_syslog_h)
AC_SUBST(unet_cv_func_poll_syscall)
+
+dnl Check OS for os_dep files.
+uname=`uname`
+AC_MSG_CHECKING(for OS type)
+case "$uname" in
+ *inux*)
+ AC_MSG_RESULT($uname found.)
+ OSDEP_C="os_linux.c"
+ ;;
+ *olaris*)
+ AC_MSG_RESULT($uname found.)
+ OSDEP_C="os_solaris.c"
+ ;;
+ *SunOS*)
+ AC_MSG_RESULT($uname found.)
+ OSDEP_C="os_solaris.c"
+ ;;
+ *BSD*)
+ AC_MSG_RESULT($uname found.)
+ OSDEP_C="os_bsd.c"
+ ;;
+ *)
+ AC_MSG_RESULT(Unknown OS. Using generic routines.)
+ OSDEP_C="os_generic.c"
+ ;;
+esac
+AC_SUBST(OSDEP_C)
dnl Finally really generate all output files:
AC_OUTPUT(config-sh Configure ../Makefile ../ircd/Makefile ../doc/Makefile Makefile, [echo timestamp > stamp-h;],)
Index: setup.h.in
===================================================================
RCS file: /cvsroot/irc-dev/ircdh/config/setup.h.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- setup.h.in 26 Jul 2002 21:58:23 -0000 1.1.1.1
+++ setup.h.in 18 Aug 2002 22:49:41 -0000 1.2
@@ -16,12 +16,36 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef gid_t
+
+/* Define if system calls automatically restart after interruption
+ by a signal. */
+#undef HAVE_RESTARTABLE_SYSCALLS
+
+/* Define to `unsigned' if <sys/types.h> doesn't define. */
+#undef size_t
+
+/* Define if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Define if your <sys/time.h> declares struct tm. */
+#undef TM_IN_SYS_TIME
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef uid_t
+
+/* Define if your processor stores words with the most significant
+ byte first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
+
/* Define if you have the resolv library (-lresolv) */
#undef HAVE_LIB_RESOLV
-/* Define if you have the setrlimit function */
-#undef HAVE_SETRLIMIT
-
/* Define one of these, depending on wether you have
POSIX, BSD or SYSV non-blocking stuff */
#undef NBLOCK_POSIX
@@ -49,191 +73,20 @@
/* Define this to the printf signed format for time_t */
#undef STIME_T_FMT
-/* Define if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
-/* Define if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
-/* Define if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define if you have the `gethostname' function. */
-#undef HAVE_GETHOSTNAME
-
-/* Define if you have the `getrusage' function. */
-#undef HAVE_GETRUSAGE
-
-/* Define if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define if you have the `inet_netof' function. */
-#undef HAVE_INET_NETOF
-
-/* Define if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if you have the `crypt' library (-lcrypt). */
-#undef HAVE_LIBCRYPT
-
-/* Define if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-
-/* Define if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if you have the `mkdir' function. */
-#undef HAVE_MKDIR
-
-/* Define if you have the <net/errno.h> header file. */
-#undef HAVE_NET_ERRNO_H
-
-/* Define if you have the <poll.h> header file. */
-#undef HAVE_POLL_H
-
-/* Define if system calls automatically restart after interruption by a
- signal. */
-#undef HAVE_RESTARTABLE_SYSCALLS
-
-/* Define if you have the `res_init' function. */
-#undef HAVE_RES_INIT
-
-/* Define if you have the `select' function. */
-#undef HAVE_SELECT
-
-/* Define if you have the `setrlimit' function. */
-#undef HAVE_SETRLIMIT
-
-/* Define if you have the `socket' function. */
-#undef HAVE_SOCKET
-
-/* Define if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define if you have the `strtoken' function. */
-#undef HAVE_STRTOKEN
-
-/* Define if you have the <syslog.h> header file. */
-#undef HAVE_SYSLOG_H
-
-/* Define if you have the <sys/cdefs.h> header file. */
-#undef HAVE_SYS_CDEFS_H
-
-/* Define if you have the <sys/file.h> header file. */
-#undef HAVE_SYS_FILE_H
-
-/* Define if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define if you have the <sys/malloc.h> header file. */
-#undef HAVE_SYS_MALLOC_H
-
-/* Define if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define if you have the `times' function. */
-#undef HAVE_TIMES
-
-/* Define if you have the `uname' function. */
-#undef HAVE_UNAME
-
-/* Define if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* Define if the `setvbuf' function takes the buffering type as its second
- argument and the buffer pointer as the third, as on System V before release
- 3. */
-#undef SETVBUF_REVERSED
-
-/* The size of a `int', as computed by sizeof. */
+/* The number of bytes in a int. */
#undef SIZEOF_INT
-/* The size of a `long', as computed by sizeof. */
+/* The number of bytes in a long. */
#undef SIZEOF_LONG
-/* The size of a `short', as computed by sizeof. */
+/* The number of bytes in a short. */
#undef SIZEOF_SHORT
-/* The size of a `size_t', as computed by sizeof. */
+/* The number of bytes in a size_t. */
#undef SIZEOF_SIZE_T
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
-/* Define if your processor stores words with the most significant byte first
- (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-
-/* Define if on MINIX. */
-#undef _MINIX
-
-/* Define if the system does not provide POSIX.1 features except with this
- defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef gid_t
-
-/* Define to `short' if <sys/types.h> does not define. */
-#undef int16_t
-
-/* Define to `long' if <sys/types.h> does not define. */
-#undef int32_t
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to `unsigned short' if <sys/types.h> does not define. */
-#undef u_int16_t
-
-/* Define to `unsigned long' if <sys/types.h> does not define. */
-#undef u_int32_t
+/* Define if you have the <poll.h> header file. */
+#undef HAVE_POLL_H
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef uid_t
+/* Define if you have the crypt library (-lcrypt). */
+#undef HAVE_LIBCRYPT
|
