diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | aclocal.m4 | 6 | ||||
| -rwxr-xr-x | config.guess | 4 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | config.sub | 17 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rwxr-xr-x | depcomp | 11 | ||||
| -rw-r--r-- | doc/Makefile.in | 2 | ||||
| -rw-r--r-- | help/Makefile.in | 2 | ||||
| -rw-r--r-- | help/opers/Makefile.in | 2 | ||||
| -rw-r--r-- | help/users/Makefile.in | 2 | ||||
| -rw-r--r-- | include/memory.h | 7 | ||||
| -rw-r--r-- | libltdl/Makefile.in | 2 | ||||
| -rw-r--r-- | messages/Makefile.in | 2 | ||||
| -rw-r--r-- | modules/Makefile.in | 2 | ||||
| -rw-r--r-- | modules/core/Makefile.in | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/memory.c | 21 | ||||
| -rw-r--r-- | tools/Makefile.in | 2 |
20 files changed, 38 insertions, 63 deletions
diff --git a/Makefile.in b/Makefile.in index 969d9a2..a77fd32 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.12.4 -*- Autoconf -*- +# generated automatically by aclocal 1.12.5 -*- Autoconf -*- # Copyright (C) 1996-2012 Free Software Foundation, Inc. @@ -9519,7 +9519,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12.4], [], +m4_if([$1], [1.12.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9535,7 +9535,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12.4])dnl +[AM_AUTOMAKE_VERSION([1.12.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/config.guess b/config.guess index 137bedf..872b96a 100755 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-08-14' +timestamp='2012-09-25' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -306,7 +306,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) diff --git a/config.h.in b/config.h.in index 70439c0..0635cdf 100644 --- a/config.h.in +++ b/config.h.in @@ -106,9 +106,6 @@ /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H -/* Define to 1 if you have the `mmap' function. */ -#undef HAVE_MMAP - /* Define to 1 if you have the `opendir' function. */ #undef HAVE_OPENDIR @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-08-18' +timestamp='2012-10-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -156,7 +156,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,8 +259,10 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -273,7 +275,7 @@ case $basic_machine in | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -389,7 +391,8 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -788,7 +791,7 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; mingw64) @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: configure.ac 1654 2012-11-16 19:39:37Z michael . +# From configure.ac Id: configure.ac 1660 2012-11-17 19:35:07Z michael . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for ircd-hybrid 8.0.0. # @@ -2373,7 +2373,6 @@ $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -as_fn_append ac_func_list " mmap" as_fn_append ac_func_list " strtok_r" as_fn_append ac_func_list " usleep" as_fn_append ac_func_list " strlcat" @@ -13526,8 +13525,6 @@ done - - # Checks for header files. diff --git a/configure.ac b/configure.ac index e0a54e5..1dc023a 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_REVISION([$Id$]) AC_PREREQ(2.69) AC_INIT([ircd-hybrid], [8.0.0], [bugs@ircd-hybrid.org]) -AM_INIT_AUTOMAKE(1.12.4) +AM_INIT_AUTOMAKE(1.12.5) AM_MAINTAINER_MODE AC_CONFIG_HEADER(config.h) AC_CONFIG_SRCDIR(src/ircd.c) @@ -32,8 +32,7 @@ AX_CHECK_LIB_IPV6 AC_C_BIGENDIAN # Checks for library functions. -AC_CHECK_FUNCS_ONCE(mmap \ - strtok_r \ +AC_CHECK_FUNCS_ONCE(strtok_r \ usleep \ strlcat \ strlcpy) @@ -74,6 +74,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -108,7 +111,7 @@ if test "$depmode" = msvc7msys; then fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. gccflag=-qmakedep=gcc,-MF depmode=gcc fi @@ -142,13 +145,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then diff --git a/doc/Makefile.in b/doc/Makefile.in index 3002666..251e229 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff --git a/help/Makefile.in b/help/Makefile.in index b298e44..9655ad1 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff --git a/help/opers/Makefile.in b/help/opers/Makefile.in index 92df928..5376cbc 100644 --- a/help/opers/Makefile.in +++ b/help/opers/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff --git a/help/users/Makefile.in b/help/users/Makefile.in index d76503e..cc1353e 100644 --- a/help/users/Makefile.in +++ b/help/users/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff --git a/include/memory.h b/include/memory.h index 01e76bd..806c928 100644 --- a/include/memory.h +++ b/include/memory.h @@ -26,7 +26,6 @@ #define _I_MEMORY_H #include "ircd_defs.h" -#include "config.h" extern void outofmemory(void); @@ -35,10 +34,4 @@ extern void *MyRealloc(void *, size_t); extern void MyFree(void *); extern void *xstrdup(const char *); extern void *xstrndup(const char *, size_t); - -#ifndef NDEBUG -extern void mem_frob(void *, int); -#else -#define mem_frob(x, y) -#endif #endif /* _I_MEMORY_H */ diff --git a/libltdl/Makefile.in b/libltdl/Makefile.in index 1dbd6a8..9070d2a 100644 --- a/libltdl/Makefile.in +++ b/libltdl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff --git a/messages/Makefile.in b/messages/Makefile.in index 15f362b..2fdb331 100644 --- a/messages/Makefile.in +++ b/messages/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff --git a/modules/Makefile.in b/modules/Makefile.in index 3b811d6..2ab40cb 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff --git a/modules/core/Makefile.in b/modules/core/Makefile.in index 9af88eb..abf0a72 100644 --- a/modules/core/Makefile.in +++ b/modules/core/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff --git a/src/Makefile.in b/src/Makefile.in index 838791b..a3121d0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff --git a/src/memory.c b/src/memory.c index e73b87e..0e6ce5f 100644 --- a/src/memory.c +++ b/src/memory.c @@ -110,24 +110,3 @@ outofmemory(void) ilog(LOG_TYPE_IRCD, "Out of memory: restarting server..."); restart("Out of Memory"); } - -#ifndef NDEBUG -/* - * frob some memory. debugging time. - * -- adrian - */ -void -mem_frob(void *data, int len) -{ - /* correct for Intel only! little endian */ - unsigned char b[4] = { 0xef, 0xbe, 0xad, 0xde }; - int i; - char *cdata = data; - - for (i = 0; i < len; i++) - { - *cdata = b[i % 4]; - cdata++; - } -} -#endif diff --git a/tools/Makefile.in b/tools/Makefile.in index 6146275..6d6ef2c 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. |