* Fixed some autoconf errors

svn: 1610

autotools/includes/acinclude.m4

@@ -5,7 +5,8 @@ dnl
 
 dnl  EGG_CHECK_CC()
 dnl
-AC_DEFUN(EGG_CHECK_CC, [dnl
+AC_DEFUN([EGG_CHECK_CC], 
+[
 if test "${cross_compiling-x}" = "x"
 then
   cat << 'EOF' >&2
@@ -22,11 +23,12 @@ if test -n "$GXX"; then
   CXXFLAGS="$CXXFLAGS -O3"
 fi
 
-])dnl
+])
 
 dnl  EGG_IPV6_OPTIONS()
 dnl
-AC_DEFUN(EGG_IPV6_OPTIONS, [dnl
+AC_DEFUN([EGG_IPV6_OPTIONS], 
+[
 AC_MSG_CHECKING(whether or not you disabled IPv6 support)
 AC_ARG_ENABLE(ipv6, [  --disable-ipv6           disable IPv6 support],
 [ ac_cv_dipv6="yes"
@@ -44,12 +46,13 @@ if ! test "$EGG_CYGWIN" = "yes"; then
    AC_DEFINE(USE_IPV6, 1, [Define if you want ipv6 support])
  fi
 fi
-])dnl
+])
 
 
 dnl  EGG_CHECK_SOCKLEN_T()
 dnl
-AC_DEFUN(EGG_CHECK_SOCKLEN_T, [dnl
+AC_DEFUN([EGG_CHECK_SOCKLEN_T], 
+[
 AC_MSG_CHECKING(for socklen_t)
 AC_CACHE_VAL(egg_cv_socklen_t,[
   AC_TRY_RUN([
@@ -73,7 +76,7 @@ if test "$egg_cv_socklen_t" = "yes"; then
 else
   AC_MSG_RESULT(no)
 fi
-])dnl
+])
 
 
 dnl EGG_CHECK_CCPIPE()
@@ -138,7 +141,8 @@ AC_DEFUN([EGG_CHECK_CCWALL],
 dnl  EGG_CHECK_CCSTATIC()
 dnl
 dnl  Checks whether the compiler supports the `-static' flag.
-AC_DEFUN(EGG_CHECK_CCSTATIC, [dnl
+AC_DEFUN([EGG_CHECK_CCSTATIC],
+[
 if test -z "$no_static"
 then
   if test -n "$GXX"
@@ -166,12 +170,13 @@ EOF
     fi
   fi
 fi
-])dnl
+])
 
 dnl EGG_PROG_HEAD_1()
 dnl
-AC_DEFUN(EGG_PROG_HEAD_1,
-[cat << 'EOF' > conftest.head
+AC_DEFUN([EGG_PROG_HEAD_1],
+[
+cat << 'EOF' > conftest.head
 a
 b
 c
@@ -211,12 +216,12 @@ fi
 rm -f conftest.head
 HEAD_1=$ac_cv_prog_HEAD_1
 AC_SUBST(HEAD_1)dnl
-])dnl
-
+])
 
 dnl  EGG_PROG_AWK()
 dnl
-AC_DEFUN(EGG_PROG_AWK, [dnl
+AC_DEFUN([EGG_PROG_AWK], 
+[
 # awk is needed for Tcl library and header checks, and eggdrop version subst
 AC_PROG_AWK
 if test "${AWK-x}" = "x"
@@ -230,12 +235,13 @@ configure: error:
 EOF
   exit 1
 fi
-])dnl
+])
 
 
 dnl  EGG_PROG_BASENAME()
 dnl
-AC_DEFUN(EGG_PROG_BASENAME, [dnl
+AC_DEFUN([EGG_PROG_BASENAME],
+[
 # basename is needed for Tcl library and header checks
 AC_CHECK_PROG(BASENAME, basename, basename)
 if test "${BASENAME-x}" = "x"
@@ -249,15 +255,15 @@ configure: error:
 EOF
   exit 1
 fi
-])dnl
+])
 
 
 dnl  EGG_CHECK_OS()
 dnl
 dnl
-AC_DEFUN(EGG_CHECK_OS, [dnl
+AC_DEFUN([EGG_CHECK_OS],
+[
 EGG_CYGWIN=no
-
 AC_CACHE_CHECK(system type, egg_cv_var_system_type, egg_cv_var_system_type=`$UNAME -s`)
 AC_CACHE_CHECK(system release, egg_cv_var_system_release, egg_cv_var_system_release=`$UNAME -r`)
 AC_CACHE_CHECK(system machine, egg_cv_var_system_machine, egg_cv_var_system_machine=`$UNAME -m`)
@@ -341,7 +347,7 @@ case "$egg_cv_var_system_type" in
     fi
   ;;
 esac
-])dnl
+])
 
 dnl EGG_CYGWIN_BINMODE
 dnl
@@ -363,7 +369,8 @@ AC_DEFUN([EGG_CYGWIN_BINMODE],
 
 dnl  EGG_CHECK_LIBS()
 dnl
-AC_DEFUN(EGG_CHECK_LIBS, [dnl
+AC_DEFUN([EGG_CHECK_LIBS], 
+[
   AC_CHECK_LIB(socket, socket)
 #  AC_CHECK_LIB(nsl, connect)
   AC_CHECK_LIB(dns, gethostbyname)
@@ -384,11 +391,12 @@ AC_DEFUN(EGG_CHECK_LIBS, [dnl
 #        ac_cv_lib_pthread_pthread_mutex_init=yes
 #        ac_cv_lib_pthread=""],
 #        ac_cv_lib_pthread_pthread_mutex_init=no)])])])
-])dnl
+])
 
 dnl  EGG_CHECK_FUNC_VSPRINTF()
 dnl
-AC_DEFUN(EGG_CHECK_FUNC_VSPRINTF, [dnl
+AC_DEFUN([EGG_CHECK_FUNC_VSPRINTF], 
+[
 AC_CHECK_FUNCS(vsprintf)
 if test "$ac_cv_func_vsprintf" = "no"
 then
@@ -401,11 +409,12 @@ configure: error:
 EOF
   exit 1
 fi
-])dnl
+])
 
 dnl  EGG_CHECK_FUNC_UNAME()
 dnl
-AC_DEFUN(EGG_CHECK_FUNC_UNAME, [dnl
+AC_DEFUN([EGG_CHECK_FUNC_UNAME], 
+[
 AC_CHECK_FUNCS(uname)
 if test "$ac_cv_func_uname" = "no"
 then
@@ -418,11 +427,12 @@ configure: error:
 EOF
   exit 1
 fi
-])dnl
+])
 
 dnl  EGG_CHECK_ZLIB()
 dnl
-AC_DEFUN(EGG_CHECK_ZLIB, [dnl
+AC_DEFUN([EGG_CHECK_ZLIB], 
+[
 if test "x${ZLIB}" = x; then
   cat >&2 <<EOF
 configure: error:
@@ -444,12 +454,13 @@ EOF
     exit 1
   fi
 fi
-])dnl
+])
 
 
 dnl  EGG_CHECK_SSL()
 dnl
-AC_DEFUN(EGG_CHECK_SSL, [dnl
+AC_DEFUN([EGG_CHECK_SSL], 
+[
 if test "x${SSL}" = x; then
   cat >&2 <<EOF
 configure: error:
@@ -471,11 +482,12 @@ EOF
     exit 1
   fi
 fi
-])dnl
+])
 
 dnl  EGG_HEADER_STDC()
 dnl
-AC_DEFUN(EGG_HEADER_STDC, [dnl
+AC_DEFUN([EGG_HEADER_STDC], 
+[
 if test "$ac_cv_header_stdc" = "no"
 then
   cat << 'EOF' >&2
@@ -487,27 +499,29 @@ configure: error:
 EOF
   exit 1
 fi
-])dnl
+])
 
 
 dnl  EGG_CACHE_UNSET(CACHE-ID)
 dnl
 dnl  Unsets a certain cache item. Typically called before using
 dnl  the AC_CACHE_*() macros.
-AC_DEFUN(EGG_CACHE_UNSET, [dnl
+AC_DEFUN([EGG_CACHE_UNSET], 
+[
   unset $1
 ])
 
 
 dnl  EGG_SUBST_VERSION()
 dnl
-AC_DEFUN(EGG_SUBST_VERSION, [dnl
+AC_DEFUN([EGG_SUBST_VERSION], 
+[
 VERSION=`grep "char" $srcdir/src/main.c | $AWK '/egg_version/ {print [$]5}' | sed -e 's/\"//g' | sed -e 's/\;//g'`
 version_num=`echo $VERSION | $AWK 'BEGIN {FS = "."} {printf("%d%02d%02d", [$]1, [$]2, [$]3)}'`
 AC_DEFINE_UNQUOTED(EGG_VERSION, $version_num, [Defines the current pack version])dnl
 AC_SUBST(VERSION)dnl
 AC_SUBST(NUMVER)dnl
-])dnl
+])
 
 
 dnl  EGG_SUBST_MOD_UPDIR()
@@ -516,7 +530,8 @@ dnl  Since module's Makefiles aren't generated by configure, some
 dnl  paths in src/mod/Makefile.in take care of them. For correct
 dnl  path "calculation", we need to keep absolute paths in mind
 dnl  (which don't need a "../" pre-pended).
-AC_DEFUN(EGG_SUBST_MOD_UPDIR, [dnl
+AC_DEFUN([EGG_SUBST_MOD_UPDIR],
+[
 case "$srcdir" in
   [[\\/]]* | ?:[[\\/]]*)
     MOD_UPDIR=""
@@ -553,7 +568,8 @@ m4_define(EGG_REPLACE_IF_CHANGED,
 
 dnl  EGG_SAVE_PARAMETERS()
 dnl
-AC_DEFUN(EGG_SAVE_PARAMETERS, [dnl
+AC_DEFUN([EGG_SAVE_PARAMETERS],
+[
   # Remove --cache-file and --srcdir arguments so they do not pile up.
   egg_ac_parameters=
   ac_prev=
@@ -581,10 +597,11 @@ AC_DEFUN(EGG_SAVE_PARAMETERS, [dnl
   done
 
   AC_SUBST(egg_ac_parameters)dnl
-])dnl
+])
 
 
-AC_DEFUN([AC_PROG_CC_WIN32], [
+AC_DEFUN([AC_PROG_CC_WIN32], 
+[
 AC_MSG_CHECKING([how to access the Win32 API])
 WIN32FLAGS=
 AC_TRY_COMPILE(,[
@@ -621,7 +638,7 @@ AC_MSG_RESULT([not found])
 ])
 
 ])
-dnl
+
 
 AC_DEFUN([EGG_CHECK_RANDOM_MAX],
 [

autotools/includes/depend.m4

@@ -4,7 +4,8 @@
 
 dnl  EGG_CHECK_DEPMODE()
 dnl
-AC_DEFUN(EGG_CHECK_DEPMODE, [dnl
+AC_DEFUN([EGG_CHECK_DEPMODE],
+[
 CCDEPMODE=gcc
 num=`$CXX -dumpversion | sed "s/^\\\(.\\\).*/\\\1/"`
 if test $num = "3"; then
@@ -14,7 +15,7 @@ if test $num = "3"; then
 fi
 AC_SUBST(CCDEPMODE)dnl
 AC_SUBST(GCC3)dnl
-])dnl
+])
 
 AC_DEFUN([DO_DEPS],
 [
@@ -53,6 +54,6 @@ for mf in $files; do
     echo "_$base.c:" >> "$dirpart/.deps/includes"
   done
 done
-])# DO_DEPS
+])
 
 

autotools/includes/wrap.m4

@@ -1,6 +1,6 @@
 dnl  FIND_WRAPS()
 dnl
-AC_DEFUN(FIND_WRAPS, [dnl
+AC_DEFUN([FIND_WRAPS], [
 
 ld_line="-Wl"
 for func in `grep -hrsI __wrap_ src/compat/* | sed -e '[s/^__wrap_\(.*\)(.*/\1/]'`; do
@@ -11,4 +11,4 @@ for func in `grep -hrsI __wrap_ src/compat/* | sed -e '[s/^__wrap_\(.*\)(.*/\1/]
  AC_SUBST(WRAP)
 done
 
-])dnl
+])

configure

@@ -1301,6 +1301,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
   # Remove --cache-file and --srcdir arguments so they do not pile up.
   egg_ac_parameters=
   ac_prev=
@@ -1889,6 +1890,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+
 if test "${cross_compiling-x}" = "x"
 then
   cat << 'EOF' >&2
@@ -2888,6 +2890,7 @@ echo "${ECHO_T}$egg_cv_var_ccpipe" >&6
   fi
 
 
+
 CCDEPMODE=gcc
 num=`$CXX -dumpversion | sed "s/^\\\(.\\\).*/\\\1/"`
 if test $num = "3"; then
@@ -2983,6 +2986,7 @@ echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
+
 cat << 'EOF' > conftest.head
 a
 b
@@ -3029,6 +3033,7 @@ fi
 rm -f conftest.head
 HEAD_1=$ac_cv_prog_HEAD_1
 
+
 # awk is needed for Tcl library and header checks, and eggdrop version subst
 for ac_prog in gawk mawk nawk awk
 do
@@ -3082,6 +3087,7 @@ EOF
   exit 1
 fi
 
+
 # basename is needed for Tcl library and header checks
 # Extract the first word of "basename", so it can be a program name with args.
 set dummy basename; ac_word=$2
@@ -3275,8 +3281,8 @@ fi
 
 
 # Test the os and set the module linking settings
-EGG_CYGWIN=no
 
+EGG_CYGWIN=no
 echo "$as_me:$LINENO: checking system type" >&5
 echo $ECHO_N "checking system type... $ECHO_C" >&6
 if test "${egg_cv_var_system_type+set}" = set; then
@@ -3556,6 +3562,7 @@ esac
 
 # Check for IPv6 support
 #EGG_IPV6_SUPPORTED
+
 echo "$as_me:$LINENO: checking whether or not you disabled IPv6 support" >&5
 echo $ECHO_N "checking whether or not you disabled IPv6 support... $ECHO_C" >&6
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
@@ -3585,6 +3592,7 @@ _ACEOF
  fi
 fi
 
+
 echo "$as_me:$LINENO: checking for socklen_t" >&5
 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
 if test "${egg_cv_socklen_t+set}" = set; then
@@ -3676,6 +3684,7 @@ _ACEOF
 
 
 # Create static binaries
+
 if test -z "$no_static"
 then
   if test -n "$GXX"
@@ -3813,6 +3822,7 @@ rm -f confcache
 
 # Checks for system libraries
 
+
 echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_socket+set}" = set; then
@@ -10234,6 +10244,7 @@ done
 #mkdir munmap realpath select setlocale socket strchr strerror strpbrk strrchr strstr strtol tzset])
 
 
+
 for ac_func in vsprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -10347,6 +10358,7 @@ EOF
 fi
 
 
+
 for ac_func in uname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -10461,6 +10473,7 @@ fi
 
 
 # Make sure we have stdc headers, since we can't compile without them
+
 if test "$ac_cv_header_stdc" = "no"
 then
   cat << 'EOF' >&2
@@ -10530,6 +10543,7 @@ if diff $cache_file confcache >/dev/null 2>&1; then :; else
 fi
 rm -f confcache
 
+
 VERSION=`grep "char" $srcdir/src/main.c | $AWK '/egg_version/ {print $5}' | sed -e 's/\"//g' | sed -e 's/\;//g'`
 version_num=`echo $VERSION | $AWK 'BEGIN {FS = "."} {printf("%d%02d%02d", $1, $2, $3)}'`
 
@@ -10538,6 +10552,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 #FIND_WRAPS
+
 case "$srcdir" in
   [\\/]* | ?:[\\/]*)
     MOD_UPDIR=""