X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/b3076f1675cc9f0761035f5a36e22327ca8904d9..e42487a5d0733c361fce6607ed7f01025f650aa1:/configure

diff --git a/configure b/configure
old mode 100644
new mode 100755
index bfeb7a1..1c5fb80
--- a/configure
+++ b/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
-# From configure.in Id: configure.in,v 1.2 2004/06/28 22:45:19 r33d Exp .
+# From configure.in Id: configure.in,v 1.6 2005/03/07 03:51:23 sirvulcan Exp .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for srvx 1.3.
+# Generated by GNU Autoconf 2.59 for X3 1.4.
 #
-# Report bugs to <srvx-bugs@lists.sourceforge.net>.
+# Report bugs to <x2serv-general@lists.sourceforge.net>.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -268,11 +268,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 : ${ac_max_here_lines=38}
 
 # Identity of this package.
-PACKAGE_NAME='srvx'
-PACKAGE_TARNAME='srvx'
-PACKAGE_VERSION='1.3'
-PACKAGE_STRING='srvx 1.3'
-PACKAGE_BUGREPORT='srvx-bugs@lists.sourceforge.net'
+PACKAGE_NAME='X3'
+PACKAGE_TARNAME='x3'
+PACKAGE_VERSION='1.4'
+PACKAGE_STRING='X3 1.4'
+PACKAGE_BUGREPORT='x2serv-general@lists.sourceforge.net'
 
 ac_unique_file="src/opserv.c"
 # Factoring default headers for most tests.
@@ -312,7 +312,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB LN_S CPP EGREP ALLOCA MODULE_OBJS MY_SUBDIRS RX_INCLUDES RX_LIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB LN_S CPP EGREP ALLOCA MODULE_OBJS MY_SUBDIRS RX_INCLUDES RX_LIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -781,7 +781,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures srvx 1.3 to adapt to many kinds of systems.
+\`configure' configures X3 1.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -848,7 +848,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of srvx 1.3:";;
+     short | recursive ) echo "Configuration of X3 1.4:";;
    esac
   cat <<\_ACEOF
 
@@ -868,7 +868,7 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-malloc=type      Enables use of a special malloc library; one of:
-                          system (the default), boehm-gc, dmalloc, mpatrol
+                          system (the default), boehm-gc, dmalloc, mpatrol, x3, slab
   --with-protocol=name    Choose IRC dialect to support; one of:
                           p10 (the default), bahamut
   --without-getopt        Disables building of the GNU getopt library
@@ -885,7 +885,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <srvx-bugs@lists.sourceforge.net>.
+Report bugs to <x2serv-general@lists.sourceforge.net>.
 _ACEOF
 fi
 
@@ -981,7 +981,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-srvx configure 1.3
+X3 configure 1.4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -995,7 +995,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by srvx $as_me 1.3, which was
+It was created by X3 $as_me 1.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1331,7 +1331,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-CODENAME=surge
+CODENAME=X3
           ac_config_headers="$ac_config_headers src/config.h"
 
 
@@ -1442,7 +1442,7 @@ test -n "$target_alias" &&
   test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
-am__api_version="1.8"
+am__api_version="1.9"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1594,13 +1594,21 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
 if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
   #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
 else
   # On NextStep and OpenStep, the `mkdir' command does not
   # recognize any option.  It will interpret all options as
@@ -1715,8 +1723,8 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='srvx'
- VERSION='1.3'
+ PACKAGE='x3'
+ VERSION='1.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1744,9 +1752,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
@@ -1839,6 +1844,13 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
 
 
 
@@ -5331,9 +5343,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ---------------------------------------------- ##
-## Report this to srvx-bugs@lists.sourceforge.net ##
-## ---------------------------------------------- ##
+## --------------------------------------------------- ##
+## Report this to x2serv-general@lists.sourceforge.net ##
+## --------------------------------------------------- ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -5671,8 +5683,8 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
 _ACEOF
 
 else
-  { { echo "$as_me:$LINENO: error: ftime or gettimeofday required.  srvx build will fail." >&5
-echo "$as_me: error: ftime or gettimeofday required.  srvx build will fail." >&2;}
+  { { echo "$as_me:$LINENO: error: ftime or gettimeofday required.  X3 build will fail." >&5
+echo "$as_me: error: ftime or gettimeofday required.  X3 build will fail." >&2;}
    { (exit 1); exit 1; }; }
 fi
 done
@@ -5694,7 +5706,8 @@ fi
 
 
 
-for ac_func in bcopy memcpy memset strdup strerror strsignal localtime_r setrlimit inet_ntoa getopt getopt_long regcomp regexec regfree sysconf
+
+for ac_func in bcopy getpagesize memcpy memset strdup strerror strsignal localtime_r setrlimit inet_ntoa getopt getopt_long regcomp regexec regfree sysconf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5899,8 +5912,8 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
 _ACEOF
 
 else
-  { { echo "$as_me:$LINENO: error: a required function was not found.  srvx build will fail." >&5
-echo "$as_me: error: a required function was not found.  srvx build will fail." >&2;}
+  { { echo "$as_me:$LINENO: error: a required function was not found.  X3 build will fail." >&5
+echo "$as_me: error: a required function was not found.  X3 build will fail." >&2;}
    { (exit 1); exit 1; }; }
 fi
 done
@@ -6384,9 +6397,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ---------------------------------------------- ##
-## Report this to srvx-bugs@lists.sourceforge.net ##
-## ---------------------------------------------- ##
+## --------------------------------------------------- ##
+## Report this to x2serv-general@lists.sourceforge.net ##
+## --------------------------------------------------- ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -7120,9 +7133,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ---------------------------------------------- ##
-## Report this to srvx-bugs@lists.sourceforge.net ##
-## ---------------------------------------------- ##
+## --------------------------------------------------- ##
+## Report this to x2serv-general@lists.sourceforge.net ##
+## --------------------------------------------------- ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -7358,9 +7371,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ---------------------------------------------- ##
-## Report this to srvx-bugs@lists.sourceforge.net ##
-## ---------------------------------------------- ##
+## --------------------------------------------------- ##
+## Report this to x2serv-general@lists.sourceforge.net ##
+## --------------------------------------------------- ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -7669,9 +7682,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ---------------------------------------------- ##
-## Report this to srvx-bugs@lists.sourceforge.net ##
-## ---------------------------------------------- ##
+## --------------------------------------------------- ##
+## Report this to x2serv-general@lists.sourceforge.net ##
+## --------------------------------------------------- ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -7860,6 +7873,24 @@ cat >>confdefs.h <<\_ACEOF
 #define WITH_MALLOC_BOEHM_GC 1
 _ACEOF
 
+elif test "x$withval" = "xx3" ; then
+  echo "$as_me:$LINENO: result: x3" >&5
+echo "${ECHO_T}x3" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_MALLOC_X3 1
+_ACEOF
+
+  MODULE_OBJS="$MODULE_OBJS alloc-x3.\$(OBJEXT)"
+elif test "x$withval" = "xslab" ; then
+  echo "$as_me:$LINENO: result: slab" >&5
+echo "${ECHO_T}slab" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_MALLOC_SLAB 1
+_ACEOF
+
+  MODULE_OBJS="$MODULE_OBJS alloc-slab.\$(OBJEXT)"
 else
   { { echo "$as_me:$LINENO: error: Unknown malloc type $withval" >&5
 echo "$as_me: error: Unknown malloc type $withval" >&2;}
@@ -7884,7 +7915,7 @@ cat >>confdefs.h <<\_ACEOF
 #define WITH_PROTOCOL_P10 1
 _ACEOF
 
-  MODULE_OBJS="$MODULE_OBJS proto-p10.\$(OBJEXT)"
+  MODULE_OBJS="$MODULE_OBJS proto-p10.o"
   PROTO_FILES=proto-p10.c
 elif test "x$withval" = "xbahamut" ; then
   echo "$as_me:$LINENO: result: Bahamut" >&5
@@ -7894,7 +7925,7 @@ cat >>confdefs.h <<\_ACEOF
 #define WITH_PROTOCOL_BAHAMUT 1
 _ACEOF
 
-  MODULE_OBJS="$MODULE_OBJS proto-bahamut.\$(OBJEXT)"
+  MODULE_OBJS="$MODULE_OBJS proto-bahamut.o"
 else
   { { echo "$as_me:$LINENO: error: Unknown IRC dialect $withval" >&5
 echo "$as_me: error: Unknown IRC dialect $withval" >&2;}
@@ -7978,7 +8009,7 @@ if test "${enable_modules+set}" = set; then
   module_list=""
     for module in $enableval ; do
     module=`echo $module | sed -e s/^mod-// -e s/\.c\$//`
-    EXTRA_MODULE_OBJS="$EXTRA_MODULE_OBJS mod-$module.\$(OBJEXT)"
+    EXTRA_MODULE_OBJS="$EXTRA_MODULE_OBJS mod-$module.o"
     module_list="$module_list $module"
     echo "WITH_MODULE($module)" >> $MODULE_DEFINES
   done
@@ -8409,7 +8440,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by srvx $as_me 1.3, which was
+This file was extended by X3 $as_me 1.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8472,7 +8503,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-srvx config.status 1.3
+X3 config.status 1.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -8695,7 +8726,6 @@ s,@AUTOCONF@,$AUTOCONF,;t t
 s,@AUTOMAKE@,$AUTOMAKE,;t t
 s,@AUTOHEADER@,$AUTOHEADER,;t t
 s,@MAKEINFO@,$MAKEINFO,;t t
-s,@AMTAR@,$AMTAR,;t t
 s,@install_sh@,$install_sh,;t t
 s,@STRIP@,$STRIP,;t t
 s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
@@ -8704,6 +8734,9 @@ s,@mkdir_p@,$mkdir_p,;t t
 s,@AWK@,$AWK,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@am__leading_dot@,$am__leading_dot,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@am__tar@,$am__tar,;t t
+s,@am__untar@,$am__untar,;t t
 s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
 s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
 s,@MAINT@,$MAINT,;t t
@@ -9358,27 +9391,21 @@ echo X"$mf" |
   else
     continue
   fi
-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   # When using ansi2knr, U may be empty or an underscore; expand it
   U=`sed -n 's/^U = //p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue