[IRC-Dev CVS] [CVS] Module ircdh: Change committed
Brought to you by:
zolty
From: Toni G. <zo...@us...> - 2003-01-23 10:42:46
|
CVSROOT : /cvsroot/irc-dev Module : ircdh Commit time: 2003-01-23 10:42:44 UTC Removed files: config/Configure.in config/Makefile.in config/README config/acconfig.h config/acinclude.m4 config/aclocal.m4 config/config-sh.in config/configure config/configure.in config/gen.doc.Makefile config/gen.ircd.Makefile config/install-sh config/parse.none config/setup.h.in config/setup.h.top config/stamp-h.in Log message: Eliminacion directorio config/ ---------------------- diff included ---------------------- Index: ircdh/config/Configure.in diff -u ircdh/config/Configure.in:1.2 ircdh/config/Configure.in:removed --- ircdh/config/Configure.in:1.2 Sun Aug 18 15:49:41 2002 +++ ircdh/config/Configure.in Thu Jan 23 02:42:44 2003 @@ -1,556 +0,0 @@ -# @configure_input@ -# -# This script is used to configure the IRC-Hispano IRC Daemon. -# It was copied from the linux kernel distribution and only slightly -# changed. -# -# 170897 (ca...@ru...) - -# Changed the default configuration file to be defconfig. -# Changed the location of autoconf.h to be 'include/'. -# Changed the final text printed at the end. -# Changed replacement to only match 'is not set' (and not 'is not'). -# Added function string() and define_string(). -# Added function define_macro() -# -# 180897 (ca...@ru...) - -# Changed bool() so it can take a default argument. -# Introduced hard link ../.config, to inherit config files over new -# distributions. -# Got rid of 'is not set' and using '=n' instead. -# Changed configuration help file to be doc/Configure.help. -# Changed DEFAULT into USE_DEFAULT, which is asked for in config.in. -# -# 210897 (ca...@ru...) - -# Changed the location of autoconf.h and .config to be 'configure/'. -# Fixed the script to work with a general 'sh' and not only with bash. -# (removing 'function', using `` instead of $(), using \\$ inside -# that instead of \$, using 'eval set -- $choices' rather then -# 'set -- $choices', introduction of function 'expr' instead of -# using external executable 'expr', using set -fh rather then -# set -f -h, using "" around reg.exp rather then '' and removing -# unnecessary backslashes from it). -# Removed tristate and hex functions. -# Making the hardlink to ../.config only when configure/.config doesn't exist. -# -# 280897 (ca...@ru...) - -# Added CONFIG_NEW: Ask if one wants to use this configuration as main -# configuration. -# Changed /bin/rm into $RM, so now this environment variable must be set! -# -# 290897 (ca...@ru...) - -# Added support for the solaris Born shell. -# Changed the directory configure/ to config/ in order not to collide with -# GNU autoconf in the future. -# -# 020997 (ca...@ru...) - -# The future is here... renamed 'config.in' to 'config-sh', reserving -# 'file.in' for input files of autoconfs' 'configure' script. -# 'autoconf.h' has been renamed to 'config.h', because it would be confusing -# otherwise with autoconf. -# Changed Configure to be run from within config/. -# -# 050997 (ca...@ru...) - -# Don't use 'def={$old:-$3}' but instead the equivalent ': ${def=$3}' because -# some sh don't understand the first expression. -# Pressing a 'c' at any question continues in 'batch' mode. -# -# 220199 (ca...@ru...) - -# Put MACRO name at front, making it easier to find it when scanning -# through the defaults to change just one. -# Make pressing 'c' stop at every paragraph, and pressing 'C' finish the -# whole script. -# -# ----------------------------------------------------------------------------- -# -# This script is used to configure the linux kernel. -# -# It was inspired by the challenge in the original Configure script -# to ``do something better'', combined with the actual need to ``do -# something better'' because the old configure script wasn't flexible -# enough. -# -# Please send comments / questions / bug fixes to ray...@mi.... -# -# ***** IMPORTANT COMPATIBILITY NOTE **** -# If configuration changes are made which might adversely effect -# Menuconfig or xconfig, please notify the respective authors so that -# those utilities can be updated in parallel. -# -# Menuconfig: <roa...@cf...> -# xconfig: <ape...@fo...> <er...@ai...> -# **************************************** -# -# Each line in the config file is a command. -# -# 050793 - use IFS='@' to get around a bug in a pre-version of bash-1.13 -# with an empty IFS. -# -# 030995 (st...@os...) - added support for tri-state answers, -# for selecting modules to compile. -# -# 180995 Bernhard Kaindl (bk...@pi...) - added dummy functions for -# use with a config.in modified for make menuconfig. -# -# 301195 (bo...@ma...) - added help text support -# -# 281295 Paul Gortmaker - make tri_state functions collapse to boolean -# if module support is not enabled. -# -# 010296 Aaron Ucko (uc...@va...) - fix int and hex to accept -# arbitrary ranges -# -# 150296 Dick Streefland (di...@ta...) - report new configuration -# items and ask for a value even when doing a "make oldconfig" -# -# 200396 Tom Dyas (td...@ed...) - when the module option is -# chosen for an item, define the macro <option_name>_MODULE -# -# 090397 Axel Boldt (bo...@ma...) - avoid ? and + in regular -# expressions for GNU expr since version 1.15 and up use \? and \+. - -#### Start of system configuration section. #### - -SHELL=@SHPROG@ -RM=@RMPROG@ -LN_S="@LN_S@" -unet_cv_sys_set_h=@unet_cv_sys_set_h@ - -#### End of system configuration section. #### - -# Disable filename globbing -set -f - -if test $unet_cv_sys_set_h = yes; then - set -h -fi - -# Figure out how to do 'echo' without newline: -c='' -n='' -if [ "`eval echo -n 'a'`" = "-n a" ] ; then - c='\c' -else - n='-n' -fi - -# Check if ${VAR:-def} works -DUMMY_VAR="" -DUMMY_VAR2="some value" -DUMMY_VAR=${DUMMY_VAR:-test} -DUMMY_VAR2=${DUMMY_VAR2:-test} -if [ "$DUMMY_VAR" != "test" -o "$DUMMY_VAR2" != "some value" ]; then - echo "You /bin/sh doesn't understand '\${VAR:-default}'" - exit 1 -fi - -# -# Dummy functions for use with a config.in modified for menuconf -# -mainmenu_option () { - : -} -mainmenu_name () { - : -} -endmenu () { - : -} - -# -# help prints the corresponding help text from Configure.help to stdout -# -# help variable -# -help () { - if [ -f ../doc/Configure.help ] - then - #first escape regexp special characters in the argument: - var=`echo "$1"|sed 's/[][\/.^$*]/\\&/g'` - #now pick out the right help text: - text=`sed -n "/^$var[ ]*\\$/,\\${ - /^$var[ ]*\\$/b - /^#.*/b - /^[ ]*\\$/q - p - }" ../doc/Configure.help` - if [ -z "$text" ] - then - echo; echo " Sorry, no help available for this option yet.";echo - else - (echo; echo "$text"; echo) | ${PAGER:-more} - fi - else - echo; - echo " Can't access the file doc/Configure.help which" - echo " should contain the help texts." - echo - fi -} - - -# -# readln reads a line into $ans. -# -# readln macro prompt default oldval -# -readln () { - echo $1 | awk '{ printf("%-20.20s: ", $1); }' - if [ "$USE_DEFAULT" != "n" -a -n "$4" ]; then - echo $2 - ans=$3 - else - echo $n "$2$c" - [ -z "$4" ] && echo $n "(NEW) $c" - IFS='@' read ans </dev/tty || exit 1 - [ -z "$ans" ] && ans=$3 - if [ "$ans" = "c" -o "$ans" = "C" ]; then - USE_DEFAULT=$ans - ans=$3 - fi - fi -} - -# -# comment does some pretty-printing -# -# comment 'xxx' -# -comment () { - echo "" - echo "*-----------------------------------------------------------------------------"; - echo "* $1" ; - echo "*" - (echo "" ; echo "#"; echo "# $1" ; echo "#") >>$CONFIG - (echo "" ; echo "/*"; echo " * $1" ; echo " */") >>$CONFIG_H - if [ "$USE_DEFAULT" = "c" ]; then - USE_DEFAULT=n - fi -} - -# -# define_bool sets the value of a boolean argument -# -# define_bool define value -# -define_bool () { - case "$2" in - "y") - echo "$1=y" >>$CONFIG - echo "#define $1" >>$CONFIG_H - ;; - - "n") - echo "$1=n" >>$CONFIG - echo "#undef $1" >>$CONFIG_H - ;; - esac - eval "$1=$2" -} - -# -# expr determines if string matches a regular expression -# -# expr string reg_exp -# -expr () { - MATCH=`echo $1 | egrep -e $2` - if [ -z "$MATCH" ]; then - return 1 - else - return 0 - fi -} - -# -# bool processes a boolean argument -# -# bool question define -# -bool () { - old=`eval echo "\\${$2}"` - if [ -z "$old" -a -n "$3" ]; then - def=$3 - else - def=${old:-n} - fi - case "$def" in - "y") - defprompt="Y/n/?" - def="y" - ;; - - "n") - defprompt="N/y/?" - ;; - esac - while :; do - readln $2 "$1 [$defprompt] " "$def" "$old" - case "$ans" in - [yY] | [yY]es ) - define_bool "$2" "y" - break - ;; - - [nN] | [nN]o ) - define_bool "$2" "n" - break - ;; - - * ) - help "$2" - ;; - esac - done -} - -# -# define_int sets the value of a integer argument -# -# define_int define value -# -define_int () { - echo "$1=$2" >>$CONFIG - echo "#define $1 ($2)" >>$CONFIG_H - eval "$1=$2" -} - -# -# int processes an integer argument -# -# int question define default -# -int () { - old=`eval echo "\\${$2}"` - def=${old:-$3} - while :; do - readln $2 "$1 [$def] " "$def" "$old" - if expr "$ans" "^0$|^(-[1-9]|[1-9])[0-9]*$"; then - define_int "$2" "$ans" - break - else - help "$2" - fi - done -} - -# -# choice processes a choice list (1-out-of-n) -# -# choice question choice-list default -# -# The choice list has a syntax of: -# NAME WHITESPACE VALUE { WHITESPACE NAME WHITESPACE VALUE } -# The user may enter any unique prefix of one of the NAMEs and -# choice will define VALUE as if it were a boolean option. -# VALUE must be in all uppercase. Normally, VALUE is of the -# form CONFIG_<something>. Thus, if the user selects <something>, -# the CPP symbol CONFIG_<something> will be defined and the -# shell variable CONFIG_<something> will be set to "y". -# -choice () { - question="$1" - choices="$2" - old= - def=$3 - - # determine default answer: - names="" - eval set -- $choices - firstvar=$2 - while [ -n "$2" ]; do - if [ -n "$names" ]; then - names="$names, $1" - else - names="$1" - fi - if [ "`eval echo "\\${$2}"`" = "y" ]; then - old=$1 - def=$1 - fi - shift; shift - done - - val="" - while [ -z "$val" ]; do - ambg=n - readln $names "$question [$def] " "$def" "$old" - ans=`echo $ans | tr a-z A-Z` - eval set -- $choices - while [ -n "$1" ]; do - name=`echo $1 | tr a-z A-Z` - case "$name" in - "$ans"* ) - if [ "$name" = "$ans" ]; then - val="$2" - break # stop on exact match - fi - if [ -n "$val" ]; then - echo; - echo \ - " Sorry, \"$ans\" is ambiguous; please enter a longer string." - echo - val="" - ambg=y - break - else - val="$2" - fi - ;; - esac - shift; shift - done - if [ "$val" = "" -a "$ambg" = "n" ]; then - help "$firstvar" - fi - done - eval set -- $choices - while [ -n "$2" ]; do - if [ "$2" = "$val" ]; then - echo " defined $val" - define_bool "$2" "y" - else - define_bool "$2" "n" - fi - shift; shift - done -} - -# -# define_macro sets the value of a macro argument -# -# define_macro define value -# -define_macro () { - if [ -n "$2" ]; then - echo "$1=\"$2\"" >>$CONFIG - echo "#define $1 $2" >>$CONFIG_H - fi - eval "$1=\"$2\"" -} - -# -# define_string sets the value of a string argument -# -# define_string define value -# -define_string () { - if [ -n "$2" ]; then - echo "$1=\"$2\"" >>$CONFIG - echo "#define $1 \"$2\"" >>$CONFIG_H - fi - eval "$1=\"$2\"" -} - -# -# string processes a string argument -# -# string question define default -# -string () { - old=`eval echo "\\${$2}"` - def=${old:-$3} - while :; do - readln $2 "$1 [$def] " "$def" "$old" - if expr "$ans" "^[^\"].*[^\"]$"; then - define_string "$2" "$ans" - break - else - help "$2" - fi - done -} - -CONFIG=.tmpconfig -CONFIG_H=.tmpconfig.h -trap "$RM -f $CONFIG $CONFIG_H ; exit 1" 1 2 15 - -# -# Make sure we start out with a clean slate. -# -echo "#" > $CONFIG -echo "# Configuration default generated for:" > $CONFIG -echo '# `pwd`' > $CONFIG -echo "#" > $CONFIG -echo "# Automatically generated by 'make config': don't edit" >> $CONFIG -echo "#" >> $CONFIG - -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 -if [ "$1" != "" ] ; then - CONFIG_IN=$1 -fi - -DEFAULTS=none -if [ -r .config ]; then - DEFAULTS=./.config -else - if [ -r ../../.config ]; then - echo "*" - echo "* WARNING: Inheriting .config from previous version!" - DEFAULTS=../../.config - fi -fi - -if [ -r $DEFAULTS ]; then - echo "*" - echo "* Using defaults found in" $DEFAULTS - echo "* If you type a 'C' the script will finish using all defaults." - echo "* If you type a 'c' the script will skip to the next paragraph." - echo "*" - . $DEFAULTS -else - echo "*" - echo "* No defaults found" - echo "*" -fi - -. $CONFIG_IN - -echo "#endif /* INCLUDED_config_h */" >> $CONFIG_H - -mv $CONFIG_H config.h -$RM -f .config.old -if [ -f .config ]; then - # Keep the inode of .config (hardlink to ../../.config) intact: - cp .config .config.old - cat $CONFIG > .config - $RM -f $CONFIG -fi -if test ! -f .config -o ! -r ../../.config; then - if [ "$CONFIG_BATCH" = "y" ]; then - CONFIG_NEW=n - else - CONFIG_NEW=y - USE_DEFAULT=n - echo "*" - echo "*" - echo "*" - bool 'Use .config of THIS source tree as your upgrade default' CONFIG_NEW - fi - if [ ! -f .config ]; then - mv $CONFIG .config - fi - if [ "$CONFIG_NEW" = "y" ]; then - CONFIG_CURDIR=`pwd` - cd ../.. - $RM -f .config .config.cache - ln $CONFIG_CURDIR/.config .config - ln $CONFIG_CURDIR/config.cache .config.cache - echo - echo "NOTE: Linking ../.config to THIS source tree's configuration !" - echo "(The configuration of this source tree will be used as default when you upgrade)" - fi -fi - -echo - -exit 0 Index: ircdh/config/Makefile.in diff -u ircdh/config/Makefile.in:1.1.1.1 ircdh/config/Makefile.in:removed --- ircdh/config/Makefile.in:1.1.1.1 Fri Jul 26 14:58:22 2002 +++ ircdh/config/Makefile.in Thu Jan 23 02:42:44 2003 @@ -1,104 +0,0 @@ -# config/Makefile for the IRC-Hispano IRC Daemon. -# Copyright (C) 1997, Carlo Wood <ca...@ru...> - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -#### Start of system configuration section. #### - -SHELL=@SHPROG@ -RM=@RMPROG@ -TOUCH=touch -@SET_MAKE@ -#### End of system configuration section. #### - -# Some versions of make give a warning when this is empty: -.SUFFIXES: .dummy - -# These files need to be up to date when we are building the ircd -build: config.h setup.h - -clean: - ${RM} -f .tmpconfig.h .tmpconfig - -distclean: clean - ${RM} -f .config setup.h stamp-h config.h .config.old \ - config.cache config.log config.status Makefile config-sh \ - Configure - -maintainer-clean: distclean - ${RM} -f aclocal.m4 setup.h.in stamp-h.in configure - @echo Generating aclocal.m4... - aclocal - @echo Generating setup.h.in... - autoheader - @echo timestamp > stamp-h.in - @echo Generating configure... - autoconf - -config: configure setup.h.in config.status Configure FORCE - @CONFIG_BATCH=n ${SHELL} ./Configure || exit 1 - @# Allow the use of non-GNU make with 'make config': - @cd ../ircd; ${MAKE} Makefile - @cd ../doc; ${MAKE} Makefile - -config.h: Configure config-sh - @echo Generating config.h... - @CONFIG_BATCH=y ${SHELL} ./Configure || exit 1 - @cd ../ircd; ${MAKE} Makefile - -FORCE: - -#============================================================================== -# Rules to automatically remake Configuration : - -Makefile: config.status Makefile.in - @echo "recreating config/Makefile" - @CONFIG_FILES=Makefile CONFIG_HEADERS= ./config.status > /dev/null - -aclocal.m4: acinclude.m4 - @echo Generating aclocal.m4... - @echo aclocal - @aclocal || ( echo "NOT recreating 'aclocal.m4', you don't have 'aclocal'"; touch aclocal.m4 ) - -configure: configure.in aclocal.m4 - @echo Generating configure... - @echo autoconf - @autoconf || ( echo "NOT recreating 'configure', you don't have 'autoconf'"; touch configure ) - -setup.h.in: stamp-h.in -stamp-h.in: configure.in acconfig.h setup.h.top aclocal.m4 #setup.h.bot - @echo Generating setup.h.in... - @echo autoheader - @autoheader || ( echo "NOT recreating 'setup.h.in', you don't have 'autoheader'"; touch setup.h.in ) - @echo timestamp > stamp-h.in - -setup.h: stamp-h -stamp-h: stamp-h.in config.status - @echo Generating setup.h... - @CONFIG_FILES= CONFIG_HEADERS=setup.h ./config.status - -config.status: configure - @echo Generating config.status... - @CONFIG_FILES= CONFIG_HEADERS= ./config.status --recheck || \ - (./configure && ${TOUCH} ../doc/stamp-m ../ircd/stamp-m) - -config-sh: config-sh.in config.status - @echo Generating config-sh... - @CONFIG_FILES=config-sh CONFIG_HEADERS= ./config.status - -Configure: Configure.in config.status - @echo Generating Configure... - @CONFIG_FILES=Configure CONFIG_HEADERS= ./config.status Index: ircdh/config/README diff -u ircdh/config/README:1.1.1.1 ircdh/config/README:removed --- ircdh/config/README:1.1.1.1 Fri Jul 26 14:58:22 2002 +++ ircdh/config/README Thu Jan 23 02:42:44 2003 @@ -1,94 +0,0 @@ -This directory contains NOTHING for the admin to configure. - -If you want to configure the IRC server, go to the top level directory and -type: 'make config'. - -------------------------------------------------------------------------------- - -If you are a coder and are adding a feature to the server that you need -automatic or manual configuration for, then this is where you need to -change things. - -If you touch any of the following files, then you need to have 'autoconf' -(and 'autoheader') installed - you might also need GNU m4 and perl then: - -configure.in -acconfig.h -setup.h.top - -Never touch setup.h.in and stamp-h.in. -Don't run 'make maintainer-clean' when you don't have autoconf etc. installed. - -If you touch any of the following files, then you need to have GNU make -in order to have the Makefiles correctly rebuild automatically: - -parse.none -gen.ircd.Makefile -../ircd/Makefile.in -../doc/Makefile.in -../Makefile.in - -Note that after running 'make config' special added code in config/Makefile -will remake the Makefiles as needed to allow the admins to use a non-GNU make. -But coders should use GNU make. - -Here is a sheme of which files are needed to generate which files: - - /> (config.log) - /-> (config.cache) -configure.in --(autoconf)--> configure --> config.status - \ -acconfig.h --(autoheader)--> setup.h.in --(config.status)--> setup.h -setup.h.top / (stamp-h.in) (stamp-h) - -config-sh.in --(config.status)--> config-sh --(Configure)--> config.h - (.config) -/ \-> (.config) - \> (.config.old) -Makefile.in --(config.status)--> Makefile - -The exectuable scripts (configure, config.status and Configure) should only be -called from Makefile (automatically, when needed, by means of makefile rules). - -Further more, config.status is also used to (re)generate doc/Makefile and -ircd/Makefile (from respectively doc/Makefile.in and ircd/Makefile.in). -However, ircd/Makefile is not functional then, first also gen.ircd.Makefile -must be called. All of this is done automatically by the Makefile rules -inside doc/Makefile and ircd/Makefile respectively. Finally, gen.ircd.Makefile -also calls parse.none. So: - -../ircd/Makefile.in --\ -gen.ircd.Makefile ----(config.status)--> ../ircd/Makefile -.config --/ -parse.none -/ - -../doc/Makefile.in --\ -gen.doc.Makefile ----(config.status)--> ../doc/Makefile -.config --/ -parse.none -/ - -../Makefile.in ----(config.status)--> ../Makefile - -'Configure' uses the file ../doc/Configure.help for the help texts. - -------------------------------------------------------------------------------- - -Adding an 'autoconf' check. - -1) Install GNU m4, autoconf & autoheader. -2) Add your check to configure.in, if needed also add an entry to acconfig.h -3) Add the #ifdefs to the source code. - -Adding a manual configuration. - -1) Edit config-sh.in and add the question. -2) Edit ../doc/Configure.help and add the help text ! -3) If necessary, add something to parse.none to allow the use of the - value 'none'. -4) If necessary edit gen.ircd.Makefile and ../ircd/Makefile to get your - variable in ../ircd/Makefile. (It will already be in config.h). -5) Add the #ifdefs to the source code. - -In both cases, all needed files will be automatically (re) generated when -you run 'make' from the top level directory (you need GNU make though). - -Carlo Wood Index: ircdh/config/acconfig.h diff -u ircdh/config/acconfig.h:1.1.1.1 ircdh/config/acconfig.h:removed --- ircdh/config/acconfig.h:1.1.1.1 Fri Jul 26 14:58:22 2002 +++ ircdh/config/acconfig.h Thu Jan 23 02:42:44 2003 @@ -1,32 +0,0 @@ -/* 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 -#undef NBLOCK_BSD -#undef NBLOCK_SYSV - -/* Define on of these, depending on wether you have - POSIX, BSD or SYSV signal handling */ -#undef POSIX_SIGNALS -#undef BSD_RELIABLE_SIGNALS -#undef SYSV_UNRELIABLE_SIGNALS - -/* Define these to be unsigned integral internal types, - * of respecitvely 2 and 4 bytes in size, when not already - * defined in <sys/types.h>, <stdlib.h> or <stddef.h> */ -#undef u_int16_t -#undef u_int32_t - -/* Define this to the printf format for size_t */ -#undef SIZE_T_FMT - -/* Define this to the printf format for time_t */ -#undef TIME_T_FMT - -/* Define this to the printf signed format for time_t */ -#undef STIME_T_FMT Index: ircdh/config/acinclude.m4 diff -u ircdh/config/acinclude.m4:1.1.1.1 ircdh/config/acinclude.m4:removed --- ircdh/config/acinclude.m4:1.1.1.1 Fri Jul 26 14:58:22 2002 +++ ircdh/config/acinclude.m4 Thu Jan 23 02:42:44 2003 @@ -1,290 +0,0 @@ -dnl -dnl Macro: unet_PIPE_CFLAGS -dnl -dnl If the compiler understands -pipe, add it to CFLAGS if not already -dnl there. -dnl -AC_DEFUN(unet_PIPE_CFLAGS, -[AC_MSG_CHECKING([if the compiler understands -pipe]) -unet_cv_pipe_flags="$ac_cv_prog_gcc" -if test "$ac_cv_prog_gcc" = no; then - OLDCFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -pipe" - AC_TRY_COMPILE(,,unet_cv_pipe_flags=yes,) - CFLAGS="$OLDCFLAGS" -fi -AC_MSG_RESULT($unet_cv_pipe_flags) -if test "$unet_cv_pipe_flags" = yes ; then - x=`echo $CFLAGS | grep 'pipe' 2>/dev/null` - if test "$x" = "" ; then - CFLAGS="$CFLAGS -pipe" - fi -fi -]) - -dnl -dnl Macro: unet_CHECK_LIB_RESOLV -dnl -dnl Check for res_mkquery in -lresolv and add that to LIBS when needed. -dnl -AC_DEFUN(unet_CHECK_LIB_RESOLV, -[AC_CACHE_CHECK([for res_mkquery in -lresolv], unet_cv_lib_resolv, -[AC_TRY_LINK([struct rrec; -extern int res_mkquery(int, const char *, int, int, const char *, - int, struct rrec *, unsigned char *, int);], -[int op; -const char *dname; -int class, type; -const char *data; -int datalen; -struct rrec *newrr; -unsigned char *buf; -int buflen; -res_mkquery(op,dname,class,type,data,datalen,newrr,buf,buflen)], -unet_cv_lib_resolv=no, [OLD_LIBS="$LIBS" -LIBS="$LIBS -lresolv" -AC_TRY_LINK([extern char *_res;], [*_res=0], -unet_cv_lib_resolv=yes, unet_cv_lib_resolv=no) -LIBS="$OLD_LIBS"])]) -if test $unet_cv_lib_resolv = yes; then - AC_DEFINE(HAVE_LIB_RESOLV) - LIBS="$LIBS -lresolv" -fi]) - -dnl -dnl Macro: unet_NONBLOCKING -dnl -dnl Check whether we have posix, bsd or sysv non-blocking sockets and -dnl define respectively NBLOCK_POSIX, NBLOCK_BSD or NBLOCK_SYSV. -dnl -AC_DEFUN(unet_NONBLOCKING, -[dnl Do we have posix, bsd or sysv non-blocking stuff ? -AC_CACHE_CHECK([for posix non-blocking], unet_cv_sys_nonblocking_posix, -[AC_TRY_RUN([#include <sys/types.h> -#include <sys/socket.h> -#include <fcntl.h> -#include <sys/ioctl.h> -#include <sys/file.h> -#include <signal.h> -$ac_cv_type_signal alarmed() { exit(1); } -int main(void) -{ - char b[12]; - struct sockaddr x; - size_t l = sizeof(x); - int f = socket(AF_INET, SOCK_DGRAM, 0); - if (f >= 0 && !(fcntl(f, F_SETFL, O_NONBLOCK))) - { - signal(SIGALRM, alarmed); - alarm(2); - recvfrom(f, b, 12, 0, &x, &l); - alarm(0); - exit(0); - } - exit(1); -}], unet_cv_sys_nonblocking_posix=yes, unet_cv_sys_nonblocking_posix=no)]) -if test $unet_cv_sys_nonblocking_posix = yes; then - AC_DEFINE(NBLOCK_POSIX) -else -AC_CACHE_CHECK([for bsd non-blocking], unet_cv_sys_nonblocking_bsd, -[AC_TRY_RUN([#include <sys/types.h> -#include <sys/socket.h> -#include <fcntl.h> -#include <sys/ioctl.h> -#include <sys/file.h> -#include <signal.h> -$ac_cv_type_signal alarmed() { exit(1); } -int main(void) -{ - char b[12]; - struct sockaddr x; - size_t l = sizeof(x); - int f = socket(AF_INET, SOCK_DGRAM, 0); - if (f >= 0 && !(fcntl(f, F_SETFL, O_NDELAY))) - { - signal(SIGALRM, alarmed); - alarm(2); - recvfrom(f, b, 12, 0, &x, &l); - alarm(0); - exit(0); - } - exit(1); -}], unet_cv_sys_nonblocking_bsd=yes, unet_cv_sys_nonblocking_bsd=no)]) -if test $unet_cv_sys_nonblocking_bsd = yes; then - AC_DEFINE(NBLOCK_BSD) -else - AC_DEFINE(NBLOCK_SYSV) -fi -fi]) - -dnl -dnl Macro: unet_SIGNALS -dnl -dnl Check if we have posix signals, reliable bsd signals or -dnl unreliable sysv signals and define respectively POSIX_SIGNALS, -dnl BSD_RELIABLE_SIGNALS or SYSV_UNRELIABLE_SIGNALS. -dnl -AC_DEFUN(unet_SIGNALS, -[dnl Do we have posix signals, reliable bsd signals or unreliable sysv signals ? -AC_CACHE_CHECK([for posix signals], unet_cv_sys_signal_posix, -[AC_TRY_COMPILE([#include <signal.h>], -[sigaction(SIGTERM, (struct sigaction *)0L, (struct sigaction *)0L)], -unet_cv_sys_signal_posix=yes, unet_cv_sys_signal_posix=no)]) -if test $unet_cv_sys_signal_posix = yes; then - AC_DEFINE(POSIX_SIGNALS) -else -AC_CACHE_CHECK([for bsd reliable signals], unet_cv_sys_signal_bsd, -[AC_TRY_RUN([#include <signal.h> -int calls = 0; -$ac_cv_type_signal handler() -{ - if (calls) return; - calls++; - kill(getpid(), SIGTERM); - sleep(1); -} -int main(void) -{ - signal(SIGTERM, handler); - kill(getpid(), SIGTERM); - exit (0); -}], unet_cv_sys_signal_bsd=yes, unet_cv_sys_signal_bsd=no)]) -if test $unet_cv_sys_signal_bsd = yes; then - AC_DEFINE(BSD_RELIABLE_SIGNALS) -else - AC_DEFINE(SYSV_UNRELIABLE_SIGNALS) -fi -fi]) - -dnl -dnl Macro: unet_DEFINE_SIZE_T_FMT -dnl -dnl Define SIZE_T_FMT to be "%u" or "%lu", whichever seems more appropriate. -dnl -AC_DEFUN(unet_DEFINE_SIZE_T_FMT, -[dnl Make educated guess :/, if size_t is a long or not -AC_CHECK_SIZEOF(size_t)dnl -AC_MSG_CHECKING(printf format of size_t) -if test "$ac_cv_sizeof_size_t" = 4 ; then - AC_MSG_RESULT("%u") - AC_DEFINE(SIZE_T_FMT, "%u") -else - AC_MSG_RESULT("%lu") - AC_DEFINE(SIZE_T_FMT, "%lu") -fi]) - -dnl -dnl Macro: unet_DEFINE_TIME_T_FMT -dnl -dnl Try to figure out if time_t is an int or not, and if so define -dnl TIME_T_FMT to be "%u", otherwise define it to be "%lu". -dnl Likewise define STIME_T_FMT for the signed format. -dnl -AC_DEFUN(unet_DEFINE_TIME_T_FMT, -[dnl Make educated guess :/, if time_t is a long or not -AC_MSG_CHECKING(size of time_t) -AC_CACHE_VAL(unet_cv_sizeof_time_t, -[AC_TRY_RUN([#include <stdio.h> -#include <sys/types.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(time_t)); - exit(0); -}], unet_cv_sizeof_time_t=`cat conftestval`, -unet_cv_sizeof_time_t=0, unet_cv_sizeof_time_t=0)]) -if test "$unet_cv_sizeof_time_t" = 0 ; then - AC_MSG_RESULT(unknown) - AC_DEFINE(TIME_T_FMT, "%lu") - AC_DEFINE(STIME_T_FMT, "%ld") -else - AC_MSG_RESULT([$unet_cv_sizeof_time_t]) - AC_MSG_CHECKING(printf format of time_t) - if test "$unet_cv_sizeof_time_t" = "$ac_cv_sizeof_long" ; then - AC_MSG_RESULT("%lu") - AC_DEFINE(TIME_T_FMT, "%lu") - AC_DEFINE(STIME_T_FMT, "%ld") - else - AC_MSG_RESULT("%u") - AC_DEFINE(TIME_T_FMT, "%u") - AC_DEFINE(STIME_T_FMT, "%d") - fi -fi]) - -dnl -dnl Macro: unet_CHECK_TYPE_SIZES -dnl -dnl Check the size of several types and define a valid int16_t and int32_t. -dnl -AC_DEFUN(unet_CHECK_TYPE_SIZES, -[dnl Check type sizes -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) -if test "$ac_cv_sizeof_int" = 2 ; then - AC_CHECK_TYPE(int16_t, int) - AC_CHECK_TYPE(u_int16_t, unsigned int) -elif test "$ac_cv_sizeof_short" = 2 ; then - AC_CHECK_TYPE(int16_t, short) - AC_CHECK_TYPE(u_int16_t, unsigned short) -else - AC_MSG_ERROR([Cannot find a type with size of 16 bits]) -fi -if test "$ac_cv_sizeof_int" = 4 ; then - AC_CHECK_TYPE(int32_t, int) - AC_CHECK_TYPE(u_int32_t, unsigned int) -elif test "$ac_cv_sizeof_short" = 4 ; then - AC_CHECK_TYPE(int32_t, short) - AC_CHECK_TYPE(u_int32_t, unsigned short) -elif test "$ac_cv_sizeof_long" = 4 ; then - AC_CHECK_TYPE(int32_t, long) - AC_CHECK_TYPE(u_int32_t, unsigned long) -else - AC_MSG_ERROR([Cannot find a type with size of 32 bits]) -fi]) - -dnl -dnl Macro: unet_FUNC_POLL_SYSCALL -dnl -dnl Try to figure out if we have a system call poll (not if it is emulated). -dnl Manical laughter... -dnl -AC_DEFUN(unet_FUNC_POLL_SYSCALL, -[AC_CHECK_HEADERS(poll.h)dnl -if test -z "$unet_cv_func_poll_syscall" ; then - AC_MSG_CHECKING([if poll is a system call (please wait)]) -else - AC_MSG_CHECKING([if poll is a system call]) -fi -AC_CACHE_VAL(unet_cv_func_poll_syscall, -[unet_cv_func_poll_syscall=no -dnl No need to go through the trouble when we don't have poll.h: -changequote(, )dnl -if test "$ac_cv_header_poll_h" = yes; then - unet_dirs=`find /usr/include/sys -type f -name '*.h' -exec egrep '^#include <[^/]*/.*>' {} \; | sed -e 's/^.*<//' -e 's%/.*$%%' | sort | uniq` - for i in $unet_dirs ; do - if test "$unet_cv_func_poll_syscall" = no ; then - unet_files=`ls /usr/include/$i/*.h 2> /dev/null` - if test -n "$unet_files" ; then - for j in $unet_files ; do - if test "$unet_cv_func_poll_syscall" = no ; then - unet_line=`egrep '^#define[[:space:]]+[[:alnum:]_]*[Pp][Oo][Ll][Ll]' $j` - if test -n "$unet_line" ; then - unet_sig=`echo "$unet_line" | sed -e 's/poll/fork/g' -e 's/POLL/FORK/g' -e 's/[[:space:]]//g' -e 's%/\*.*\*/%%g' -e 's/[0-9]//g'` - unet_set=`for k in "$unet_sig" ; do echo $k; done | sed -e 's% %|%g'` - unet_match=`sed -e 's/[[:space:]]//g' -e 's%/\*.*\*/%%g' -e 's/[0-9]//g' $j | egrep "$unet_set"` - if test -n "$unet_match" ; then - unet_cv_func_poll_syscall=yes - fi - fi - fi - done - fi - fi - done -fi -changequote([, ])dnl -]) -AC_MSG_RESULT([$unet_cv_func_poll_syscall]) -]) Index: ircdh/config/aclocal.m4 diff -u ircdh/config/aclocal.m4:1.1.1.1 ircdh/config/aclocal.m4:removed --- ircdh/config/aclocal.m4:1.1.1.1 Fri Jul 26 14:58:22 2002 +++ ircdh/config/aclocal.m4 Thu Jan 23 02:42:44 2003 @@ -1,391 +0,0 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4a - -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. - -dnl -dnl Macro: unet_PIPE_CFLAGS -dnl -dnl If the compiler understands -pipe, add it to CFLAGS if not already -dnl there. -dnl -AC_DEFUN(unet_PIPE_CFLAGS, -[AC_MSG_CHECKING([if the compiler understands -pipe]) -unet_cv_pipe_flags="$ac_cv_prog_gcc" -if test "$ac_cv_prog_gcc" = no; then - OLDCFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -pipe" - AC_TRY_COMPILE(,,unet_cv_pipe_flags=yes,) - CFLAGS="$OLDCFLAGS" -fi -AC_MSG_RESULT($unet_cv_pipe_flags) -if test "$unet_cv_pipe_flags" = yes ; then - x=`echo $CFLAGS | grep 'pipe' 2>/dev/null` - if test "$x" = "" ; then - CFLAGS="$CFLAGS -pipe" - fi -fi -]) - -dnl -dnl Macro: unet_CHECK_LIB_RESOLV -dnl -dnl Check for res_mkquery in -lresolv and add that to LIBS when needed. -dnl -AC_DEFUN(unet_CHECK_LIB_RESOLV, -[AC_CACHE_CHECK([for res_mkquery in -lresolv], unet_cv_lib_resolv, -[AC_TRY_LINK([struct rrec; -extern int res_mkquery(int, const char *, int, int, const char *, - int, struct rrec *, unsigned char *, int);], -[int op; -const char *dname; -int class, type; -const char *data; -int datalen; -struct rrec *newrr; -unsigned char *buf; -int buflen; -res_mkquery(op,dname,class,type,data,datalen,newrr,buf,buflen)], -unet_cv_lib_resolv=no, [OLD_LIBS="$LIBS" -LIBS="$LIBS -lresolv" -AC_TRY_LINK([extern char *_res;], [*_res=0], -unet_cv_lib_resolv=yes, unet_cv_lib_resolv=no) -LIBS="$OLD_LIBS"])]) -if test $unet_cv_lib_resolv = yes; then - AC_DEFINE(HAVE_LIB_RESOLV) - LIBS="$LIBS -lresolv" -fi]) - -dnl -dnl Macro: unet_NONBLOCKING -dnl -dnl Check whether we have posix, bsd or sysv non-blocking sockets and -dnl define respectively NBLOCK_POSIX, NBLOCK_BSD or NBLOCK_SYSV. -dnl -AC_DEFUN(unet_NONBLOCKING, -[dnl Do we have posix, bsd or sysv non-blocking stuff ? -AC_CACHE_CHECK([for posix non-blocking], unet_cv_sys_nonblocking_posix, -[AC_TRY_RUN([#include <sys/types.h> -#include <sys/socket.h> -#include <fcntl.h> -#include <sys/ioctl.h> -#include <sys/file.h> -#include <signal.h> -$ac_cv_type_signal alarmed() { exit(1); } -int main(void) -{ - char b[12]; - struct sockaddr x; - size_t l = sizeof(x); - int f = socket(AF_INET, SOCK_DGRAM, 0); - if (f >= 0 && !(fcntl(f, F_SETFL, O_NONBLOCK))) - { - signal(SIGALRM, alarmed); - alarm(2); - recvfrom(f, b, 12, 0, &x, &l); - alarm(0); - exit(0); - } - exit(1); -}], unet_cv_sys_nonblocking_posix=yes, unet_cv_sys_nonblocking_posix=no)]) -if test $unet_cv_sys_nonblocking_posix = yes; then - AC_DEFINE(NBLOCK_POSIX) -else -AC_CACHE_CHECK([for bsd non-blocking], unet_cv_sys_nonblocking_bsd, -[AC_TRY_RUN([#include <sys/types.h> -#include <sys/socket.h> -#include <fcntl.h> -#include <sys/ioctl.h> -#include <sys/file.h> -#include <signal.h> -$ac_cv_type_signal alarmed() { exit(1); } -int main(void) -{ - char b[12]; - struct sockaddr x; - size_t l = sizeof(x); - int f = socket(AF_INET, SOCK_DGRAM, 0); - if (f >= 0 && !(fcntl(f, F_SETFL, O_NDELAY))) - { - signal(SIGALRM, alarmed); - alarm(2); - recvfrom(f, b, 12, 0, &x, &l); - alarm(0); - exit(0); - } - exit(1); -}], unet_cv_sys_nonblocking_bsd=yes, unet_cv_sys_nonblocking_bsd=no)]) -if test $unet_cv_sys_nonblocking_bsd = yes; then - AC_DEFINE(NBLOCK_BSD) -else - AC_DEFINE(NBLOCK_SYSV) -fi -fi]) - -dnl -dnl Macro: unet_SIGNALS -dnl -dnl Check if we have posix signals, reliable bsd signals or -dnl unreliable sysv signals and define respectively POSIX_SIGNALS, -dnl BSD_RELIABLE_SIGNALS or SYSV_UNRELIABLE_SIGNALS. -dnl -AC_DEFUN(unet_SIGNALS, -[dnl Do we have posix signals, reliable bsd signals or unreliable sysv signals ? -AC_CACHE_CHECK([for posix signals], unet_cv_sys_signal_posix, -[AC_TRY_COMPILE([#include <signal.h>], -[sigaction(SIGTERM, (struct sigaction *)0L, (struct sigaction *)0L)], -unet_cv_sys_signal_posix=yes, unet_cv_sys_signal_posix=no)]) -if test $unet_cv_sys_signal_posix = yes; then - AC_DEFINE(POSIX_SIGNALS) -else -AC_CACHE_CHECK([for bsd reliable signals], unet_cv_sys_signal_bsd, -[AC_TRY_RUN([#include <signal.h> -int calls = 0; -$ac_cv_type_signal handler() -{ - if (calls) return; - calls++; - kill(getpid(), SIGTERM); - sleep(1); -} -int main(void) -{ - signal(SIGTERM, handler); - kill(getpid(), SIGTERM); - exit (0); -}], unet_cv_sys_signal_bsd=yes, unet_cv_sys_signal_bsd=no)]) -if test $unet_cv_sys_signal_bsd = yes; then - AC_DEFINE(BSD_RELIABLE_SIGNALS) -else - AC_DEFINE(SYSV_UNRELIABLE_SIGNALS) -fi -fi]) - -dnl -dnl Macro: unet_DEFINE_SIZE_T_FMT -dnl -dnl Define SIZE_T_FMT to be "%u" or "%lu", whichever seems more appropriate. -dnl -AC_DEFUN(unet_DEFINE_SIZE_T_FMT, -[dnl Make educated guess :/, if size_t is a long or not -AC_CHECK_SIZEOF(size_t)dnl -AC_MSG_CHECKING(printf format of size_t) -if test "$ac_cv_sizeof_size_t" = 4 ; then - AC_MSG_RESULT("%u") - AC_DEFINE(SIZE_T_FMT, "%u") -else - AC_MSG_RESULT("%lu") - AC_DEFINE(SIZE_T_FMT, "%lu") -fi]) - -dnl -dnl Macro: unet_DEFINE_TIME_T_FMT -dnl -dnl Try to figure out if time_t is an int or not, and if so define -dnl TIME_T_FMT to be "%u", otherwise define it to be "%lu". -dnl Likewise define STIME_T_FMT for the signed format. -dnl -AC_DEFUN(unet_DEFINE_TIME_T_FMT, -[dnl Make educated guess :/, if time_t is a long or not -AC_MSG_CHECKING(size of time_t) -AC_CACHE_VAL(unet_cv_sizeof_time_t, -[AC_TRY_RUN([#include <stdio.h> -#include <sys/types.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(time_t)); - exit(0); -}], unet_cv_sizeof_time_t=`cat conftestval`, -unet_cv_sizeof_time_t=0, unet_cv_sizeof_time_t=0)]) -if test "$unet_cv_sizeof_time_t" = 0 ; then - AC_MSG_RESULT(unknown) - AC_DEFINE(TIME_T_FMT, "%lu") - AC_DEFINE(STIME_T_FMT, "%ld") -else - AC_MSG_RESULT([$unet_cv_sizeof_time_t]) - AC_MSG_CHECKING(printf format of time_t) - if test "$unet_cv_sizeof_time_t" = "$ac_cv_sizeof_long" ; then - AC_MSG_RESULT("%lu") - AC_DEFINE(TIME_T_FMT, "%lu") - AC_DEFINE(STIME_T_FMT, "%ld") - else - AC_MSG_RESULT("%u") - AC_DEFINE(TIME_T_FMT, "%u") - AC_DEFINE(STIME_T_FMT, "%d") - fi -fi]) - -dnl -dnl Macro: unet_CHECK_TYPE_SIZES -dnl -dnl Check the size of several types and define a valid int16_t and int32_t. -dnl -AC_DEFUN(unet_CHECK_TYPE_SIZES, -[dnl Check type sizes -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) -if test "$ac_cv_sizeof_int" = 2 ; then - AC_CHECK_TYPE(int16_t, int) - AC_CHECK_TYPE(u_int16_t, unsigned int) -elif test "$ac_cv_sizeof_short" = 2 ; then - AC_CHECK_TYPE(int16_t, short) - AC_CHECK_TYPE(u_int16_t, unsigned short) -else - AC_MSG_ERROR([Cannot find a type with size of 16 bits]) -fi -if test "$ac_cv_sizeof_int" = 4 ; then - AC_CHECK_TYPE(int32_t, int) - AC_CHECK_TYPE(u_int32_t, unsigned int) -elif test "$ac_cv_sizeof_short" = 4 ; then - AC_CHECK_TYPE(int32_t, short) - AC_CHECK_TYPE(u_int32_t, unsigned short) -elif test "$ac_cv_sizeof_long" = 4 ; then - AC_CHECK_TYPE(int32_t, long) - AC_CHECK_TYPE(u_int32_t, unsigned long) -else - AC_MSG_ERROR([Cannot find a type with size of 32 bits]) -fi]) - -dnl -dnl Macro: unet_FUNC_POLL_SYSCALL -dnl -dnl Try to figure out if we have a system call poll (not if it is emulated). -dnl Manical laughter... -dnl -AC_DEFUN(unet_FUNC_POLL_SYSCALL, -[AC_CHECK_HEADERS(poll.h)dnl -if test -z "$unet_cv_func_poll_syscall" ; then - AC_MSG_CHECKING([if poll is a system call (please wait)]) -else - AC_MSG_CHECKING([if poll is a system call]) -fi -AC_CACHE_VAL(unet_cv_func_poll_syscall, -[unet_cv_func_poll_syscall=no -dnl No need to go through the trouble when we don't have poll.h: -changequote(, )dnl -if test "$ac_cv_header_poll_h" = yes; then - unet_dirs=`find /usr/include/sys -type f -name '*.h' -exec egrep '^#include <[^/]*/.*>' {} \; | sed -e 's/^.*<//' -e 's%/.*$%%' | sort | uniq` - for i in $unet_dirs ; do - if test "$unet_cv_func_poll_syscall" = no ; then - unet_files=`ls /usr/include/$i/*.h 2> /dev/null` - if test -n "$unet_files" ; then - for j in $unet_files ; do - if test "$unet_cv_func_poll_syscall" = no ; then - unet_line=`egrep '^#define[[:space:]]+[[:alnum:]_]*[Pp][Oo][Ll][Ll]' $j` - if test -n "$unet_line" ; then - unet_sig=`echo "$unet_line" | sed -e 's/poll/fork/g' -e 's/POLL/FORK/g' -e 's/[[:space:]]//g' -e 's%/\*.*\*/%%g' -e 's/[0-9]//g'` - unet_set=`for k in "$unet_sig" ; do echo $k; done | sed -e 's% %|%g'` - unet_match=`sed -e 's/[[:space:]]//g' -e 's%/\*.*\*/%%g' -e 's/[0-9]//g' $j | egrep "$unet_set"` - if test -n "$unet_match" ; then - unet_cv_func_poll_syscall=yes - fi - fi - fi - done - fi - fi - done -fi -changequote([, ])dnl -]) -AC_MSG_RESULT([$unet_cv_func_poll_syscall]) -]) - - -# serial 1 - -# @defmac AC_PROG_CC_STDC -# @maindex PROG_CC_STDC -# @ovindex CC -# If the C compiler in not in ANSI C mode by default, try to add an option -# to output variable @code{CC} to make it so. This macro tries various -# options that select ANSI C on some system or another. It considers the -# compiler to be in ANSI C mode if it handles function prototypes correctly. -# -# If you use this macro, you should check after calling it whether the C -# compiler has been set to accept ANSI C; if not, the shell variable -# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source -# code in ANSI C, you can make an un-ANSIfied copy of it by using the -# program @code{ansi2knr}, which comes with Ghostscript. -# @end defmac - -AC_DEFUN(AM_PROG_CC_STDC, -[AC_REQUIRE([AC_PROG_CC]) -AC_BEFORE([$0], [AC_C_INLINE]) -AC_BEFORE([$0], [AC_C_CONST]) -dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require -dnl a magic option to avoid problems with ANSI preprocessor commands -dnl like #elif. -dnl FIXME: can't do this because then AC_AIX won't work due to a -dnl circular dependency. -dnl AC_BEFORE([$0], [AC_PROG_CPP]) -AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) -AC_CACHE_VAL(am_cv_prog_cc_stdc, -[am_cv_prog_cc_stdc=no -ac_save_CC="$CC" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - AC_TRY_COMPILE( -[#include <stdarg.h> -#include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -], [ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -], -[am_cv_prog_cc_stdc="$ac_arg"; break]) -done -CC="$ac_save_CC" -]) -if test -z "$am_cv_prog_cc_stdc"; then - AC_MSG_RESULT([none needed]) -else - AC_MSG_RESULT($am_cv_prog_cc_stdc) -fi -case "x$am_cv_prog_cc_stdc" in - x|xno) ;; - *) CC="$CC $am_cv_prog_cc_stdc" ;; -esac -]) - Index: ircdh/config/config-sh.in diff -u ircdh/config/config-sh.in:1.7 ircdh/config/config-sh.in:removed --- ircdh/config/config-sh.in:1.7 Sat Nov 30 16:34:06 2002 +++ ircdh/config/config-sh.in Thu Jan 23 02:42:44 2003 @@ -1,416 +0,0 @@ -# @configure_input@ -# -# By Carlo Wood (ca...@ru...) -# -# For a description of the syntax of this configuration file, -# see the config/Configure script. -# -# TO CONFIGURE THE SERVER, TYPE: 'make config' in the top level directory ! -# - -#### Start of system configuration section. #### - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -mandir=@mandir@ -CC_DEFAULT="@CC@" -CFLAGS_DEFAULT="@CFLAGS@" -CPPFLAGS_DEFAULT="@CPPFLAGS@" -LDFLAGS_DEFAULT="@LDFLAGS@" -LIBS="@LIBS@" -ac_cv_header_poll_h=@ac_cv_header_poll_h@ -unet_cv_func_poll_syscall=@unet_cv_func_poll_syscall@ -ac_cv_header_syslog_h=@ac_cv_header_syslog_h@ - -#### End of system configuration section. #### - -if [ -z "$CONFIG_BATCH" ]; then - echo "**************************************************************************" - echo "Error: Please run 'make config' that resides in the top level directory!" - echo "**************************************************************************" - exit -1 -fi - -mainmenu_name "IRC-Dev IRC Daemon Configuration" -mainmenu_option next_comment - if [ "$CONFIG_BATCH" = "n" ]; then - echo "* Welcome to the IRC-Dev IRC Daemon Configuration script." - echo "* You can restart this configuration at any time by typing 'make config'." - echo "* If you need help with your decision on any question, type a '?'" - echo "*" - USE_DEFAULT=n - else - USE_DEFAULT=C - fi - CHANGE_CONFIG=n - if [ "$DEFAULTS" != "none" ]; then - bool 'Do you want to change your previous configuration' CHANGE_CONFIG - if [ "$CHANGE_CONFIG" = "n" ]; then - echo "Ok, I will only prompt you for NEW parameters." - USE_DEFAULT=C - else - USE_DEFAULT=n - fi - else - USE_DEFAULT=n - 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 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 - fi - if [ "$exec_prefix" = "NONE" ]; then - eval exec_prefix="$prefix" - fi - string 'Which compiler do you want to use' CC "$CC_DEFAULT" - echo "* For the following four questions, specify 'none' when you want it to be empty." - if [ -z "$cflags_O3_remark" -a -n "$CFLAGS" ]; then - CFLAGS_DEFAULT=`echo "$CFLAGS" | sed -e 's%-O2%-O3%'` - if [ "$CFLAGS_DEFAULT" != "$CFLAGS" ]; then - echo "You are highly advised to use -O3 instead of -O2 if you're short in cpu cycles!" - echo "Please read documentation (press '?'):" - CFLAGS= - fi - fi - eval string "'What flags should I pass to $CC [none]'" CFLAGS "'$CFLAGS_DEFAULT'" - define_macro cflags_O3_remark done - string 'Do you need extra include directories [none]' EXTRA_INCLUDEDIRS none - if [ -z "$LDFLAGS_DEFAULT" ]; then - LDFLAGS_DEFAULT=none - else - eval LDFLAGS_DEFAULT="$LDFLAGS_DEFAULT" - fi - string 'Which linker flags do you need [none]' LDFLAGS "$LDFLAGS_DEFAULT" - if [ -z "$LIBS" ]; then - LIBS=none - fi - string 'Which extra libraries do you need [none]' IRCDLIBS "$LIBS" - eval bindir="$bindir" - string 'In which directory should I install the ircd binary' BINDIR $bindir - if [ ! -d "$BINDIR" ]; then - echo "$BINDIR : No such directory" - fi - string 'What should the name of the installed symbolic link to the exectuable be' SYMLINK ircd - string 'Which permissions do you want the binary to have' IRCDMODE 711 - string 'Which owner do you want the binary to have' IRCDOWN "`id | sed -e 's/.*uid=[0-9]*(//' -e 's/).*//' 2> /dev/null`" - string 'Which group do you want the binary to have' IRCDGRP "`id | sed -e 's/.*gid=[0-9]*(//' -e 's/).*//' 2> /dev/null`" - eval mandir=$mandir - string 'Where should I install the man page' MANDIR $mandir - if [ "$CFLAGS" = "none" ]; then - CFLAGS="" - fi - if [ "$EXTRA_INCLUDEDIRS" = "none" ]; then - EXTRA_INCLUDEDIRS="" - fi - if [ "$LDFLAGS" = "none" ]; then - LDFLAGS="" - fi - if [ "$IRCDLIBS" = "none" ]; then - IRCDLIBS="" - fi - if [ -n "$EXTRA_INCLUDEDIRS" ]; then - for i in $EXTRA_INCLUDEDIRS; do - if [ -z "$EXTRA_CPPFLAGS" ]; then - EXTRA_CPPFLAGS=-I$i - else - EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS -I$i" - fi - done - fi - if [ -z "$EXTRA_CPPFLAGS" ]; then - CPPFLAGS="-I../include -I../config" - else - CPPFLAGS="-I../include -I../config $EXTRA_CPPFLAGS" - fi - echo "EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >>$CONFIG - echo "CPPFLAGS=\"$CPPFLAGS\"" >>$CONFIG - bool 'Use inlining for a few crucial functions' FORCEINLINE y -endmenu - -if [ "$ac_cv_header_poll_h" = "yes" ]; then - if [ "$unet_cv_func_poll_syscall" = "yes" ]; then - define_bool USE_POLL y - else - mainmenu_option next_comment - comment 'Operating System specific defines.' - bool 'You have poll(), but do you want to use it' USE_POLL - endmenu - fi -fi - -mainmenu_option next_comment -comment 'Host specific defines' - if [ -f /etc/resolv.conf ]; then - DOMAINNAME_DEFAULT="`awk '/^domain/ { print $2; exit }' /etc/resolv.conf`" - fi - string 'What is the domain name of your network' DOMAINNAME $DOMAINNAME_DEFAULT - if [ -z "$DOMAINNAME" ]; then - DOMAINNAME=none - fi - string 'What is the network name of your network' NETWORK IRC-Dev - string 'Please give a random seed of eight characters' RANDOM_SEED 12345678 - bool 'Does your host have a reliable clock' RELIABLE_CLOCK -endmenu - -mainmenu_option next_comment -comment 'General defines' - bool 'Change root ('/') after start of daemon' CHROOTDIR - bool 'Do you want the daemon set its own uid/gid' CONFIG_SETUGID y - if [ "$CONFIG_SETUGID" = "y" ]; then - int ' UID of irc daemon' IRC_UID - int ' GID of irc daemon' IRC_GID - else - define_int IRC_UID $IRC_UID - define_int IRC_GID $IRC_GID - bool 'Allow to specify configuration file on command line' CMDLINE_CONFIG - if [ "$CMDLINE_CONFIG" = "y" ]; then - echo " SECURITY: Then don't install the daemon SUID or SGID !" - fi - fi - bool 'Do you need virtual hosting' VIRTUAL_HOST - PREV_HUB=$HUB - bool 'Will you connect to more then one server at a time' HUB - if [ "$PREV_HUB" != "$HUB" ]; then - BUFFERPOOL= - fi -endmenu - - -mainmenu_option next_comment -comment 'Paths and files' - eval DPATH_DEFAULT="${prefix}/lib/ircd" - string 'Directory where all ircd stuff resides' DPATH $DPATH_DEFAULT - define_string SPATH "$BINDIR/$SYMLINK" - echo "The following filenames are either full paths or files within DPATH" - string 'Server configuration file' CPATH 'ircd.conf' - string 'Server MOTD file' MPATH 'ircd.motd' - string 'Server remote MOTD file (3 lines max)' RPATH 'remote.motd' - if [ "$DEBUGMODE" = "y" ]; then - string 'Debug file if DEBUGMODE' LPATH '/tmp/ircd.log' - else - define_string LPATH "$LPATH" - fi - string 'File for server pid' PPATH 'ircd.pid' -endmenu - -mainmenu_option next_comment -comment 'Logging (filenames are either full paths or files within DPATH)' - bool 'Do you want to log the use of /WHO x% (recommended)' CONFIG_LOG_WHOX y - if [ "$CONFIG_LOG_WHOX" = "y" ]; then - string ' Give the path and(or) filename of this log file' WPATH 'whox.log' - fi - -comment 'Bad Channel G-Lines allow operators to add channel masks to a list which prohibits local clients from being able joining channels which match the mask. Remote BadChan Glines allow Uworld to add or remove channels from the servers internal list of badchans' - bool 'Do you want to enable Bad Channel G-lines' BADCHAN y - if [ "$BADCHAN" = "y" ]; then - echo " " - echo " WARNING DO _NOT_ USE LOCAL BADCHANNEL GLINES ON UNDERNET" - echo " Use of LOCAL BAD Channel G-Lines can be cause for REMOVAL" - bool 'Allow LOCAL BAD Channel G-lines' LOCAL_BADCHAN - fi - - bool 'Do you want to log G-lines to a separate file' CONFIG_LOG_GLINES - if [ "$CONFIG_LOG_GLINES" = "y" ]; then - string ' Give the path and(or) filename of this log file' GPATH 'gline.log' - fi - bool 'Do you want to log connecting users to a separate file' CONFIG_LOG_USERS - if [ "$CONFIG_LOG_USERS" = "y" ]; then - string ' Give the path and(or) filename of this log file' FNAME_USERLOG $DPATH/users - fi - bool 'Do you want to log Opers to a separate file' CONFIG_LOG_OPERS - if [ "$CONFIG_LOG_OPERS" = "y" ]; then - string ' Give the path and(or) filename of this log file' FNAME_OPERLOG $DPATH/opers - fi - if [ "$ac_cv_header_syslog_h" = "yes" ]; then - bool 'Do you want to use syslog' USE_SYSLOG - else - USE_SYSLOG=n - fi - if [ "$USE_SYSLOG" = "y" ]; then - bool ' Log all operator kills to syslog' SYSLOG_KILL - bool ' Log all remote squits for all servers to syslog' SYSLOG_SQUIT - bool ' Log remote connect messages for other all servs' SYSLOG_CONNECT - bool ' Log all users who successfully become an Oper' SYSLOG_OPER - bool ' Send userlog stuff to syslog' SYSLOG_USERS - if [ "$SYSLOG_KILL" = "n" -a "$SYSLOG_SQUIT" = "n" -a \ - "$SYSLOG_CONNECT" = "n" -a "$SYSLOG_OPER" = "n" -a \ - "$SYSLOG_USERS" = "n" ]; then - define_macro LOG_FACILITY $LOG_FACILITY - define_bool USE_SYSLOG n - else - choice ' Log facility' \ - "daemon CONFIG_DAEMON \ - user CONFIG_USER \ - local0-7 CONFIG_LOCAL" daemon - if [ "$CONFIG_DAEMON" = "y" ]; then - define_macro LOG_FACILITY LOG_DAEMON - else - if [ "$CONFIG_USER" = "y" ]; then - define_macro LOG_FACILITY LOG_USER - else - int ' Which local facility (0-7)' INT_LOCAL - define_macro LOG_FACILITY LOG_LOCAL$INT_LOCAL - fi - fi - echo " Using log facility $LOG_FACILITY" - fi - else - define_bool SYSLOG_KILL $SYSLOG_KILL - define_bool SYSLOG_SQUIT $SYSLOG_SQUIT - define_bool SYSLOG_CONNECT $SYSLOG_CONNECT - define_bool SYSLOG_OPER $SYSLOG_OPER - define_bool SYSLOG_USERS $SYSLOG_USERS - define_macro LOG_FACILITY $LOG_FACILITY - fi -endmenu - -mainmenu_option next_comment -comment 'Configuration' -# echo 'ATENCION: Si tienes en la red unos services P09, es obligatorio responder Y a la siguiente pregunta' -# bool 'Activar el soporte del protocolo P09' P09_SUPPORT - bool 'Use crypted passwords for operators' CRYPT_OPER_PASSWORD y - DUMMY=`echo "$BUFFERPOOL" | sed -e 's/[0-9]//g'` - if [ "$DUMMY" != "" ]; then - BUFFERPOOL= - fi - if [ "$HUB" = "y" ]; then - int 'Max size of the total of of all sendqs (bytes)' BUFFERPOOL 27000000 - else - int 'Max size of the total of of all sendqs (bytes)' BUFFERPOOL 9000000 - fi - int 'Max receive queue for clients (bytes)' CLIENT_FLOOD 2048 - int 'Maximum number of network connections (23 - (FD_SETSIZE-4))' MAXCONNECTIONS 252 - 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 - bool 'Show IP address in client connection notices' SNO_CONNEXIT_IP - fi - bool 'Do you want to use R: lines in your configuration file' R_LINES - if [ "$R_LINES" = "y" ]; then - bool 'Process R: lines every rehash' R_LINES_REHASH y - bool 'Process R: lines always' R_LINES_OFTEN - else - define_bool R_LINES_REHASH $R_LINES_REHASH - define_bool R_LINES_OFTEN $R_LINES_OFTEN - 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 y - 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 - bool 'Allow HELPERS to see all invisible users' WHOX_HELPERS y - fi - bool 'Allow global Opers (O:) to see inside secret channels' OPERS_SEE_IN_SECRET_CHANNELS y - if [ "$OPERS_SEE_IN_SECRET_CHANNELS" = "y" ]; then - bool 'Allow local Opers (o:) to see inside secret channels' LOCOP_SEE_IN_SECRET_CHANNELS - fi - bool 'Do not truncate obnoxiously long /who output for opers' UNLIMIT_OPER_QUERY - bool 'Allow Opers to use the KILL command' OPER_KILL y - bool 'Allow Opers to use the REHASH command' OPER_REHASH y - bool 'Allow Opers to use the RESTART command' OPER_RESTART y - bool 'Allow Opers to use the DIE command' OPER_DIE y - bool 'Allow Opers to add local G-lines' OPER_LGLINE y - bool 'Allow Opers to connect from a remote site' OPER_REMOTE y - bool 'Allow Opers to join channels using a master key - ESNET' OPER_JOIN_GOD_ESNET y - bool 'Allow Opers to became channel service - ESNET' OPER_CHANNEL_SERVICE_ESNET y - bool 'Local Channel Services has no Flood Control - ESNET' CS_NO_FLOOD_ESNET y - bool 'Allow Opers to bypass UWorld mode changes - ESNET' OPER_XMODE_ESNET y - bool 'Allow local opers to use the REHASH command' LOCOP_REHASH y - bool 'Allow local opers to use the RESTART command' LOCOP_RESTART - bool 'Allow local opers to use the DIE command' LOCOP_DIE - bool 'Allow local opers to add local G-lines' LOCOP_LGLINE y - bool 'Allow local/global opers to be on any number of channels' OPER_NO_CHAN_LIMIT y - 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 - bool 'Prevent local/global opers from being kicked or deoped on local channels' NO_OPER_DEOP_LCHAN - -endmenu - -mainmenu_option next_comment -comment 'Server characteristics' - bool 'Do you want to have a default LIST parameter' CONFIG_LIST y - if [ "$CONFIG_LIST" = "y" ]; then - string 'Give default LIST parameter' DEFAULT_LIST 'T<10' - define_string DEFAULT_LIST_PARAM "$DEFAULT_LIST" - else - define_string DEFAULT_LIST "$DEFAULT_LIST" - define_bool DEFAULT_LIST_PARAM - fi - bool 'K: line comments treated as a file by default' COMMENT_IS_FILE y - bool 'Only nullify idle-time on PRIVMSG' IDLE_FROM_MSG y - bool 'Enable excessive TS differences check before servers links' CHECK_TS_LINKS y -endmenu - -mainmenu_option next_comment -comment 'Mandatory defines (you should leave these untouched)' - bool 'HISPANO/ESNET: Distributed DataBase Support' BDD y - if [ "$BDD" = "y" ]; then - eval DBPATH_DEFAULT="database" - string 'HISPANO/ESNET: Directory where distributed database resides' DBPATH $DBPATH_DEFAULT - # bool 'HISPANO/ESNET: Distributed Clone Control support' BDD_CLONES y - bool 'HISPANO/ESNET: CHAN_DB features (join # FUNDADOR, modeX)' BDD_CHAN_HACK y - bool 'HISPANO/ESNET: OPER_DB features (join # OPER, modeX)' BDD_OPER_HACK y - if [ "$BDD_OPER_HACK" = "y" ]; then - # bool 'HISPANO/ESNET: OPER_DB features only on registered (CHAN_DB) channels' BDD_OPER_HACK_ONLYREG n - bool 'HISPANO/ESNET: OPER_DB members can be Chanserv (+k)' BDD_OPER_HACK_KMODE y - fi - bool 'HISPANO/ESNET: Soporte para la ocultacion de IPs' BDD_VIP y - if [ "$BDD_VIP" = "y" ]; then - bool 'HISPANO/ESNET: Ignorar el flag "+x" a menos que el usuario este en la tabla "v" o "w"' BDD_VIP3 n - if [ "$BDD_VIP3" = "n" ]; then - bool 'HISPANO/ESNET: Ocultación de IP de TODOS los usuarios' BDD_VIP2 y - fi - fi - fi - bool 'HISPANO/ESNET: XMODE Networking' XMODE_ESNET y -# bool 'HISPANO/ESNET: Dinamic Negotiation link-by-link' ESNET_NEG y -# if [ "$ESNET_NEG" = "y" ]; then -# bool 'HISPANO/ESNET: ZLIB compression between servers - ESN... [truncated message content] |