From e87d1ceed5a589579d4995654e9e7d48e9facb7c Mon Sep 17 00:00:00 2001 From: Rick Bird Date: Mon, 25 Apr 2011 18:54:27 -0400 Subject: [PATCH] Added proper templates of all AC_DEFINES so autoreconf can rebuild config.h.in IssueID #240 --- config.h.in | 656 +++++++++++++++++++++++++++++++++------------------ configure.ac | 145 ++++++------ 2 files changed, 498 insertions(+), 303 deletions(-) diff --git a/config.h.in b/config.h.in index d8d1395..17528e7 100644 --- a/config.h.in +++ b/config.h.in @@ -1,406 +1,606 @@ -/* PennMUSH config.h. Autogenerated by ./configure */ +/* config.h.in. Generated from configure.ac by autoheader. */ -#ifndef __CONFIG_H -#define __CONFIG_H +/* Don't use translation messages */ +#undef DONT_TRANSLATE -/* Headers */ +/* Path to system ed */ +#undef ED_PATH -/* What needs this? */ -#undef I_ARPA_INET +/* Force IPV4 */ +#undef FORCE_IPV4 -/* What needs this? */ -#undef I_ARPA_NAMESER +/* most gcc compilers know a function __attribute__((__malloc__)) */ +#undef GCC_MALLOC_CALL -#undef I_FCNTL +/* bindtextdomain function */ +#undef HAS_BINDTEXTDOMAIN -#undef I_FLOATINGPOINT +/* Has system crypt */ +#undef HAS_CRYPT -#undef I_LIBINTL +/* Have /dev/urandom */ +#undef HAS_DEV_URANDOM -/* Get rid of this */ -#undef I_MALLOC +/* has gai_strerror() */ +#undef HAS_GAI_STRERROR -#undef I_NETDB +/* has getaddrinfo() */ +#undef HAS_GETADDRINFO -#undef I_NETINET_IN +/* has getdate() */ +#undef HAS_GETDATE -#undef I_NETINET_TCP +/* has gethostbyname2 function */ +#undef HAS_GETHOSTBYNAME2 -#undef I_SYS_ERRNO +/* has getnameinfo */ +#undef HAS_GETNAMEINFO -#undef I_SYS_FILE +/* has getpagesize() */ +#undef HAS_GETPAGESIZE -#undef I_SYS_IN +/* has getrlimit function */ +#undef HAS_GETRLIMIT -#undef I_SYS_MMAN +/* has getrusage */ +#undef HAS_GETRUSAGE -#undef I_SYS_PAGE +/* has inet_pton */ +#undef HAS_INET_PTON -#undef I_SYS_PARAM +/* has setitimer */ +#undef HAS_ITIMER -#undef I_SYS_SOCKET +/* has setlocale */ +#undef HAS_SETLOCALE -#undef I_SYS_STAT +/* check for snprintf */ +#undef HAS_SNPRINTF -#undef I_SYS_TIME +/* check for sysconf function */ +#undef HAS_SYSCONF -#undef TIME_WITH_SYS_TIME +/* check for textdomain */ +#undef HAS_TEXTDOMAIN -#undef I_SYS_TYPES +/* check for vsnprintf */ +#undef HAS_VSNPRINTF -#undef HAVE_UNISTD_H +/* HAVE_ALTIVEC */ +#undef HAVE_ALTIVEC -#ifdef HAVE_UNISTD_H -#define I_UNISTD -#endif +/* Define to 1 if you have the `cbrt' function. */ +#undef HAVE_CBRT -#undef HAVE_SYS_WAIT_H +/* Define to 1 if you have the declaration of `h_errno', and to 0 if you + don't. */ +#undef HAVE_DECL_H_ERRNO -#undef HAVE_IEEEFP_H +/* Define to 1 if you have the declaration of `SIGCHLD', and to 0 if you + don't. */ +#undef HAVE_DECL_SIGCHLD -#undef HAVE_SYS_UN_H +/* Define to 1 if you have the declaration of `SIGCLD', and to 0 if you don't. + */ +#undef HAVE_DECL_SIGCLD -#undef HAVE_SYS_RESOURCE_H +/* Do we have ed? */ +#undef HAVE_ED -#undef HAVE_SYS_EVENT_H +/* Define to 1 if you have the `epoll_ctl' function. */ +#undef HAVE_EPOLL_CTL -#undef HAVE_SYS_UIO_H +/* Define to 1 if you have the header file. */ +#undef HAVE_FAM_H -#undef HAVE_POLL_H +/* Define to 1 if you have the `fcntl' function. */ +#undef HAVE_FCNTL -#undef HAVE_SYS_EPOLL_H +/* Define to 1 if you have the `fork' function. */ +#undef HAVE_FORK -#undef HAVE_SYS_SELECT_H +/* Define to 1 if you have the `fpsetmask' function. */ +#undef HAVE_FPSETMASK -#undef HAVE_SYS_INOTIFY_H +/* Define to 1 if you have the `fpsetround' function. */ +#undef HAVE_FPSETROUND -#undef HAVE_FAM_H +/* Define to 1 if you have the `geteuid' function. */ +#undef HAVE_GETEUID -#undef HAVE_LIBFAM +/* Define to 1 if you have the `getpid' function. */ +#undef HAVE_GETPID -#undef HAVE_ZLIB_H +/* Define to 1 if you have the `getppid' function. */ +#undef HAVE_GETPPID -#undef HAVE_LIBZ +/* Define to 1 if you have the `getpriority' function. */ +#undef HAVE_GETPRIORITY -/* C99ish headers. The first two are really really nice to have. */ +/* Define to 1 if you have the `gettext' function. */ +#undef HAVE_GETTEXT -#undef HAVE_STDINT_H +/* Define to 1 if you have the `getuid' function. */ +#undef HAVE_GETUID -#undef HAVE_INTTYPES_H +/* check for h_errno */ +#undef HAVE_H_ERRNO -#undef HAVE_STDBOOL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_IEEEFP_H -/* Libraries */ +/* Define to 1 if you have the `imaxdiv' function. */ +#undef HAVE_IMAXDIV -#undef HAVE_MYSQL +/* Define to 1 if you have the `inotify_init' function. */ +#undef HAVE_INOTIFY_INIT -#undef HAVE_POSTGRESQL +/* Define to 1 if the system has the type `intmax_t'. */ +#undef HAVE_INTMAX_T -#undef HAVE_SQLITE3 +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H -#undef HAVE_SSL +/* check for isnormal function in math.h */ +#undef HAVE_ISNORMAL -#ifdef HAVE_SSL -#define HAS_OPENSSL -#endif +/* Define to 1 if you have the `kqueue' function. */ +#undef HAVE_KQUEUE -#undef HAVE_PCRE +/* Define to 1 if you have the `crypt' library (-lcrypt). */ +#undef HAVE_LIBCRYPT -/* Types */ +/* Define to 1 if you have the `fam' library (-lfam). */ +#undef HAVE_LIBFAM -#undef HAVE__BOOL +/* Define to 1 if you have the `intl' library (-lintl). */ +#undef HAVE_LIBINTL -#undef ssize_t +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM -/* Should be in */ -#undef socklen_t +/* Define to 1 if you have the `pcre' library (-lpcre). */ +#undef HAVE_LIBPCRE -#undef pid_t +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ -/* All of these are in if present. Otherwise autoconf - guesses. */ +/* Define to 1 if you have the `log2' function. */ +#undef HAVE_LOG2 -#undef uint8_t +/* Define to 1 if the system has the type `long long int'. */ +#undef HAVE_LONG_LONG_INT -#undef uint16_t +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H -#undef int32_t +/* Define to 1 if MySQL libraries are available */ +#undef HAVE_MYSQL -#undef uint32_t +/* Check for system pcre */ +#undef HAVE_PCRE -#undef int64_t +/* Define to 1 if you have the `poll' function. */ +#undef HAVE_POLL -#undef uint64_t +/* Define to 1 if you have the `pollts' function. */ +#undef HAVE_POLLTS -/* Type of the largest int type */ -#undef intmax_t +/* Define to 1 if you have the header file. */ +#undef HAVE_POLL_H -#undef uintmax_t +/* check for posix_fadvise function */ +#undef HAVE_POSIX_FADVISE -/* 4 */ -#undef SIZEOF_INT +/* check for posix_fallocate function in fcntl.h */ +#undef HAVE_POSIX_FALLOCATE -/* 4 or 8 */ -#undef SIZEOF_LONG +/* Define to 1 if you have the `posix_memalign' function. */ +#undef HAVE_POSIX_MEMALIGN -/* 0 if no 64-bit type (We shouldn't be seeing that case) or 8. See below. */ -#undef SIZEOF_INT64_T +/* Define to 1 if PostgreSQL libraries are available */ +#undef HAVE_POSTGRESQL -/* 8 on most modern CPUs Penn will be used on. They either have 64-bit -* words (amd64, sparc64, powerpc64) or support an extended 64-bit type (i386, -* powerpc32) */ -#undef SIZEOF_INTMAX_T +/* Define to 1 if you have the `ppoll' function. */ +#undef HAVE_PPOLL -#undef SIZEOF_TIME_T +/* Define to 1 if you have the `pread' function. */ +#undef HAVE_PREAD -/* 4 or 8 */ -#undef SIZEOF_VOID_P +/* Define to 1 if you have the `pselect' function. */ +#undef HAVE_PSELECT -/* Taken from autoconf manual */ -#if HAVE_STDBOOL_H -# include -#else -# if ! HAVE__BOOL -# ifdef __cplusplus -typedef bool _Bool; -# else -# define _Bool signed char -# endif -# endif -# define bool _Bool -# define false 0 -# define true 1 -# define __bool_true_false_are_defined 1 -#endif +/* Define to 1 if you have the `pwrite' function. */ +#undef HAVE_PWRITE -/* Someday work to get rid of these. They're left over from the -pre-void days */ -typedef void* Malloc_t; -typedef void Free_t; +/* Define to 1 if you have the `round' function. */ +#undef HAVE_ROUND -/* Functions */ -#undef HAS_BINDTEXTDOMAIN +/* check for safe toupper */ +#undef HAVE_SAFE_TOUPPER -#undef HAVE_CBRT +/* Define if we can find sendmail */ +#undef HAVE_SENDMAIL -#undef HAVE_LOG2 +/* Define to 1 if you have the `seteuid' function. */ +#undef HAVE_SETEUID -#undef HAVE_ROUND +/* Define to 1 if you have the `setpgid' function. */ +#undef HAVE_SETPGID -#undef HAS_CRYPT +/* Define to 1 if you have the `setpgrp' function. */ +#undef HAVE_SETPGRP -#undef HAVE_FPSETMASK +/* Define to 1 if you have the `setpriority' function. */ +#undef HAVE_SETPRIORITY -#undef HAVE_FPSETROUND +/* Define to 1 if you have the `setsid' function. */ +#undef HAVE_SETSID -#undef HAVE_ISNORMAL +/* Define to 1 if you have the `sigaction' function. */ +#undef HAVE_SIGACTION -#undef HAS_GAI_STRERROR +/* check for SIGCHLD */ +#undef HAVE_SIGCHLD -#undef HAS_GETADDRINFO +/* check for SIGCLD */ +#undef HAVE_SIGCLD -#undef HAS_GETDATE +/* Define to 1 if you have the `sigprocmask' function. */ +#undef HAVE_SIGPROCMASK -#undef HAS_GETHOSTBYNAME2 +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF -#undef HAS_GETNAMEINFO +/* check for struct sockaddr_in6 */ +#undef HAVE_SOCKADDR_IN6 -#undef HAS_GETPAGESIZE +/* Define to 1 if you have the `socketpair' function. */ +#undef HAVE_SOCKETPAIR -#undef HAS_GETRLIMIT +/* Have the SQLITE3 library */ +#undef HAVE_SQLITE3 -#undef HAS_GETRUSAGE +/* SSE2 */ +#undef HAVE_SSE2 -#undef HAVE_GETTEXT +/* SSE3 */ +#undef HAVE_SSE3 -#undef HAS_INET_PTON +/* Check for OpenSSL Library */ +#undef HAVE_SSL -#undef HAS_ITIMER +/* Define to 1 if stdbool.h conforms to C99. */ +#undef HAVE_STDBOOL_H -#undef HAS_SETLOCALE +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H -#undef HAVE_FORK +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H -#undef HAVE_SETPGRP +/* Define to 1 if you have the `strcasecmp' function. */ +#undef HAVE_STRCASECMP -#undef HAVE_SETSID +/* Define to 1 if you have the `strchrnul' function. */ +#undef HAVE_STRCHRNUL -#undef HAVE_SETPGID +/* Define to 1 if you have the `strcoll' function and it is properly defined. + */ +#undef HAVE_STRCOLL -#undef SETPGRP_VOID +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP -#undef HAVE_GETUID +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H -#undef HAVE_GETEUID +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H -#undef HAVE_SETEUID +/* Define to 1 if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP -#undef HAVE_GETPRIORITY +/* Define to 1 if the system has the type `struct sockaddr_in6'. */ +#undef HAVE_STRUCT_SOCKADDR_IN6 -#undef HAVE_SETPRIORITY +/* Define to 1 if you have the `strxfrm' function. */ +#undef HAVE_STRXFRM -#undef HAVE_SIGACTION +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_EPOLL_H -#undef HAVE_SIGPROCMASK +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_EVENT_H -#undef HAVE_SNPRINTF +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_INOTIFY_H -#undef HAVE_SOCKETPAIR +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_RESOURCE_H -#undef HAVE_STRCASECMP +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SELECT_H -#undef HAVE_STRNCASECMP +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H -/* Various Windows (And maybe others?) string functions start with _str */ +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H -#undef HAVE__STRICMP +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UIO_H -#undef HAVE__STRNICMP +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UN_H -#undef HAVE__STRICOLL +/* Define to 1 if you have that is POSIX.1 compatible. */ +#undef HAVE_SYS_WAIT_H -#undef HAVE__STRNCOLL +/* Define to 1 if the system has the type `uintmax_t'. */ +#undef HAVE_UINTMAX_T -#undef HAVE__STRNICOLL +/* Define to 1 if the system has the type `union wait'. */ +#undef HAVE_UNION_WAIT -#undef HAVE__SNPRINTF +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H -#undef HAVE__VSNPRINTF +/* Define to 1 if the system has the type `unsigned long long int'. */ +#undef HAVE_UNSIGNED_LONG_LONG_INT -#undef HAVE__VSNPRINTF_S +/* Define if uptime exists */ +#undef HAVE_UPTIME +/* Define to 1 if you have the `vasprintf' function. */ #undef HAVE_VASPRINTF -#undef HAVE_STRCHRNUL +/* Define to 1 if you have the `vfork' function. */ +#undef HAVE_VFORK -#undef HAVE_STRDUP +/* Define to 1 if you have the header file. */ +#undef HAVE_VFORK_H -#undef HAVE_STRCOLL +/* Define to 1 if you have the `vsnprintf' function. */ +#undef HAVE_VSNPRINTF -#undef HAVE_STRXFRM +/* Define to 1 if you have the `wait' function. */ +#undef HAVE_WAIT -#undef HAS_SYSCONF +/* Define to 1 if you have the `wait3' function. */ +#undef HAVE_WAIT3 -#undef HAS_TEXTDOMAIN +/* Define to 1 if you have the `waitpid' function. */ +#undef HAVE_WAITPID -#undef HAS_VSNPRINTF +/* Define to 1 if `fork' works. */ +#undef HAVE_WORKING_FORK -#undef HAVE_WAITPID +/* Define to 1 if `vfork' works. */ +#undef HAVE_WORKING_VFORK -#undef HAVE_WAIT3 +/* Define to 1 if you have the `writev' function. */ +#undef HAVE_WRITEV -#undef HAVE_WAIT +/* Define to 1 if you have the header file. */ +#undef HAVE_ZLIB_H -#undef UNION_WAIT +/* Define to 1 if the system has the type `_Bool'. */ +#undef HAVE__BOOL -#undef HAVE_IMAXDIV +/* Define to 1 if you have the `_stricmp' function. */ +#undef HAVE__STRICMP -#undef HAVE_GETPID +/* Define to 1 if you have the `_stricoll' function. */ +#undef HAVE__STRICOLL -#undef HAVE_GETPPID +/* Define to 1 if you have the `_strncoll' function. */ +#undef HAVE__STRNCOLL -#undef HAVE_PSELECT +/* Define to 1 if you have the `_strnicmp' function. */ +#undef HAVE__STRNICMP -#undef HAVE_POLL +/* Define to 1 if you have the `_strnicoll' function. */ +#undef HAVE__STRNICOLL -#undef HAVE_PPOLL +/* Define to 1 if you have the `_vsnprintf_s' function. */ +#undef HAVE__VSNPRINTF_S -#undef HAVE_POLLTS +/* define if your compiler has __attribute__ */ +#undef HAVE___ATTRIBUTE__ -#undef HAVE_KQUEUE +/* INFO_SLAVE */ +#undef INFO_SLAVE -#undef HAVE_EPOLL_CTL +/* I_ARPA_INET */ +#undef I_ARPA_INET -#undef HAVE_POSIX_MEMALIGN +/* I_ARPA_NAMESERV */ +#undef I_ARPA_NAMESER -#undef HAVE_WRITEV +/* I_FCNTL */ +#undef I_FCNTL -#undef HAVE_FCNTL +/* floatingpoint.h */ +#undef I_FLOATINGPOINT -#undef HAVE_INOTIFY_INIT +/* libintl.h */ +#undef I_LIBINTL -#ifdef HAVE_INOTIFY_INIT -#define HAVE_INOTIFY -#endif +/* malloc.h */ +#undef I_MALLOC -#undef HAVE_PREAD +/* netdb.h */ +#undef I_NETDB -#undef HAVE_PWRITE +/* netinet/in.h */ +#undef I_NETINET_IN -#undef HAVE_POSIX_FADVISE +/* netinet/tcp.h */ +#undef I_NETINET_TCP -#undef HAVE_POSIX_FALLOCATE +/* sys/errno.h */ +#undef I_SYS_ERRNO -/* Variables and defines */ +/* sys/file.h */ +#undef I_SYS_FILE -#undef HAVE_H_ERRNO +/* sys/in.h */ +#undef I_SYS_IN -#undef HAVE_SIGCHLD +/* sys/mman.h */ +#undef I_SYS_MMAN -#undef HAVE_SIGCLD +/* sys/page.h */ +#undef I_SYS_PAGE -/* Files */ +/* sys/param.h */ +#undef I_SYS_PARAM -#undef HAS_DEV_URANDOM +/* sys/socket.h */ +#undef I_SYS_SOCKET -/* Misc. */ +/* sys/stat.h */ +#undef I_SYS_STAT -#undef HAVE_SOCKADDR_IN6 +/* I_SYS_TIME */ +#undef I_SYS_TIME -#undef FORCE_IPV4 +/* sys/types.h */ +#undef I_SYS_TYPES -#undef DONT_TRANSLATE +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT -#undef INFO_SLAVE +/* Define to the full name of this package. */ +#undef PACKAGE_NAME -#undef HAVE_UPTIME +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING -/* Path to uptime */ -#undef UPTIME +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME -#undef HAVE_SENDMAIL +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* "enable replacement (v)snprintf if system (v)snprintf is broken" */ +#undef PREFER_PORTABLE_SNPRINTF -/* Path to sendmail */ +/* Define if Sendmail exists */ #undef SENDMAIL -#undef HAVE_ED -#undef ED_PATH +/* Define to 1 if the `setpgrp' function takes no argument. */ +#undef SETPGRP_VOID -#undef HAVE_SAFE_TOUPPER +/* The size of `int', as computed by sizeof. */ +#undef SIZEOF_INT -/* Optional language features */ -#undef restrict -#undef inline +/* The size of `int64_t', as computed by sizeof. */ +#undef SIZEOF_INT64_T -#ifdef _MSC_VER -#define WIN32_CDECL __cdecl -#else -#define WIN32_CDECL -#endif +/* The size of `intmax_t', as computed by sizeof. */ +#undef SIZEOF_INTMAX_T -#undef HAVE___ATTRIBUTE__ +/* The size of `long', as computed by sizeof. */ +#undef SIZEOF_LONG -#ifndef HAVE___ATTRIBUTE__ -#define __attribute__(x) -#endif +/* The size of `time_t', as computed by sizeof. */ +#undef SIZEOF_TIME_T -#undef GCC_MALLOC_CALL +/* The size of `void *', as computed by sizeof. */ +#undef SIZEOF_VOID_P +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS -/* Turn on SSE2 stuff automatically if supported (IE, x86-64 or x86 with the right -march switch) */ -#undef HAVE_SSE2 -#ifdef __SSE2__ -#define HAVE_SSE2 +/* Define to 1 if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME + +/* wait union exists */ +#undef UNION_WAIT + +/* Define if uptime exists */ +#undef UPTIME + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +#undef _UINT32_T + +/* Define for Solaris 2.5.1 so the uint64_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +#undef _UINT64_T + +/* Define for Solaris 2.5.1 so the uint8_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +#undef _UINT8_T + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline #endif -#undef HAVE_SSE3 -#ifdef __SSE3__ -#define HAVE_SSE3 +/* Define to the type of a signed integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +#undef int32_t + +/* Define to the type of a signed integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +#undef int64_t + +/* Define to the widest signed integer type if and do + not define. */ +#undef intmax_t + +/* Define to `int' if does not define. */ +#undef pid_t + +/* Define to the equivalent of the C99 'restrict' keyword, or to + nothing if this is not supported. Do not define if restrict is + supported directly. */ +#undef restrict +/* Work around a bug in Sun C++: it does not support _Restrict or + __restrict__, even though the corresponding Sun C compiler ends up with + "#define restrict _Restrict" or "#define restrict __restrict__" in the + previous line. Perhaps some future version of Sun C++ will work with + restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ +#if defined __SUNPRO_CC && !defined __RESTRICT +# define _Restrict +# define __restrict__ #endif -#undef HAVE_ALTIVEC +/* Substitute for socklen_t */ +#undef socklen_t + +/* Define to `int' if does not define. */ +#undef ssize_t + +/* Define to the type of an unsigned integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +#undef uint16_t + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +#undef uint32_t -/* TODO: Change in source */ -#define RESTRICT restrict +/* Define to the type of an unsigned integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +#undef uint64_t + +/* Define to the type of an unsigned integer type of width exactly 8 bits if + such a type exists and the standard includes do not define it. */ +#undef uint8_t + +/* Define to the widest unsigned integer type if and + do not define. */ +#undef uintmax_t -#endif /* __CONFIG_H */ +/* Define as `fork' if `vfork' does not work. */ +#undef vfork diff --git a/configure.ac b/configure.ac index b129931..ea64a54 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,8 @@ # this is the gnu suggested m4 macro file for lua.. doesn't work so well though -AC_INIT(configure.ac) +AC_PREREQ([2.61]) +AC_INIT([CobraMUSH], [0.80], [devteam@cobramush.org]) AC_CONFIG_HEADERS(config.h) AC_CANONICAL_BUILD @@ -19,22 +20,16 @@ fi AC_LANG(C) +AC_CHECK_HEADER([ltdl.h], + [AC_CHECK_LIB([ltdl], [lt_dladvise_init], + [LIBLTDL=-lltdl], [LIBLTDL=])], + [LIBLTDL=]) + + + # lua # Need to create lua detection that works.. -# ltdl detection -dnl Enable building of the convenience library -dnl and set LIBLTDL accordingly -#AC_LIBLTDL_CONVENIENCE -dnl Substitute INCLTDL and LIBLTDL in the Makefiles -#AC_SUBST(INCLTDL) -#AC_SUBST(LIBLTDL) -dnl Check for dlopen support -#AC_LIBTOOL_DLOPEN -dnl Configure libtool -#AC_PROG_LIBTOOL -dnl Configure libltdl -#AC_CONFIG_SUBDIRS(libltdl) ### Programs @@ -117,22 +112,22 @@ fi AC_PATH_PROG(UPTIME, uptime) if test "${UPTIME+set}" = "set"; then - AC_DEFINE([HAVE_UPTIME]) - AC_DEFINE_UNQUOTED([UPTIME], "$UPTIME") + AC_DEFINE([HAVE_UPTIME],, [Define if uptime exists]) + AC_DEFINE_UNQUOTED([UPTIME], "$UPTIME", [Define if uptime exists]) fi AC_ARG_VAR(SENDMAIL, [Path to sendmail]) AC_PATH_PROG(SENDMAIL, sendmail) if test "${SENDMAIL+set}" = "set"; then - AC_DEFINE([HAVE_SENDMAIL]) - AC_DEFINE_UNQUOTED([SENDMAIL], "$SENDMAIL") + AC_DEFINE([HAVE_SENDMAIL], , [Define if we can find sendmail]) + AC_DEFINE_UNQUOTED([SENDMAIL], "$SENDMAIL", [Define if Sendmail exists]) fi AC_ARG_VAR(ED, [Path to ed]) AC_PATH_PROG(ED, ed) if test "${ED+set}" = "set"; then - AC_DEFINE([HAVE_ED]) - AC_DEFINE_UNQUOTED([ED_PATH], "$ED -s") + AC_DEFINE([HAVE_ED], , [Do we have ed?]) + AC_DEFINE_UNQUOTED([ED_PATH], "$ED -s", [Path to system ed]) fi ### Headers @@ -143,25 +138,25 @@ AC_HEADER_STDC AC_HEADER_STDBOOL AC_HEADER_SYS_WAIT AC_HEADER_TIME -AC_CHECK_HEADER(sys/time.h, [AC_DEFINE(I_SYS_TIME)]) -AC_CHECK_HEADER(arpa/inet.h, [AC_DEFINE(I_ARPA_INET)]) -AC_CHECK_HEADER(arpa/nameser.h, [AC_DEFINE(I_ARPA_NAMESER)]) -AC_CHECK_HEADER(fcntl.h, [AC_DEFINE(I_FCNTL)]) -AC_CHECK_HEADER(floatingpoint.h, [AC_DEFINE(I_FLOATINGPOINT)]) -AC_CHECK_HEADER(libintl.h, [AC_DEFINE(I_LIBINTL)]) -AC_CHECK_HEADER(malloc.h, [AC_DEFINE(I_MALLOC)]) -AC_CHECK_HEADER(netdb.h, [AC_DEFINE(I_NETDB)]) -AC_CHECK_HEADER(netinet/in.h, [AC_DEFINE(I_NETINET_IN)]) -AC_CHECK_HEADER(netinet/tcp.h, [AC_DEFINE(I_NETINET_TCP)]) -AC_CHECK_HEADER(sys/errno.h, [AC_DEFINE(I_SYS_ERRNO)]) -AC_CHECK_HEADER(sys/file.h, [AC_DEFINE(I_SYS_FILE)]) -AC_CHECK_HEADER(sys/in.h, [AC_DEFINE(I_SYS_IN)]) -AC_CHECK_HEADER(sys/mman.h, [AC_DEFINE(I_SYS_MMAN)]) -AC_CHECK_HEADER(sys/page.h, [AC_DEFINE(I_SYS_PAGE)]) -AC_CHECK_HEADER(sys/param.h, [AC_DEFINE(I_SYS_PARAM)]) -AC_CHECK_HEADER(sys/socket.h, [AC_DEFINE(I_SYS_SOCKET)]) -AC_CHECK_HEADER(sys/stat.h, [AC_DEFINE(I_SYS_STAT)]) -AC_CHECK_HEADER(sys/types.h, [AC_DEFINE(I_SYS_TYPES)]) +AC_CHECK_HEADER(sys/time.h, [AC_DEFINE(I_SYS_TIME, , [I_SYS_TIME])]) +AC_CHECK_HEADER(arpa/inet.h, [AC_DEFINE(I_ARPA_INET, , [I_ARPA_INET])]) +AC_CHECK_HEADER(arpa/nameser.h, [AC_DEFINE(I_ARPA_NAMESER, , [I_ARPA_NAMESERV])]) +AC_CHECK_HEADER(fcntl.h, [AC_DEFINE(I_FCNTL, , [I_FCNTL])]) +AC_CHECK_HEADER(floatingpoint.h, [AC_DEFINE(I_FLOATINGPOINT, , [floatingpoint.h])]) +AC_CHECK_HEADER(libintl.h, [AC_DEFINE(I_LIBINTL, , [libintl.h])]) +AC_CHECK_HEADER(malloc.h, [AC_DEFINE(I_MALLOC, , [malloc.h])]) +AC_CHECK_HEADER(netdb.h, [AC_DEFINE(I_NETDB, , [netdb.h])]) +AC_CHECK_HEADER(netinet/in.h, [AC_DEFINE(I_NETINET_IN, , [netinet/in.h])]) +AC_CHECK_HEADER(netinet/tcp.h, [AC_DEFINE(I_NETINET_TCP, , [netinet/tcp.h])]) +AC_CHECK_HEADER(sys/errno.h, [AC_DEFINE(I_SYS_ERRNO, , [sys/errno.h])]) +AC_CHECK_HEADER(sys/file.h, [AC_DEFINE(I_SYS_FILE, , [sys/file.h])]) +AC_CHECK_HEADER(sys/in.h, [AC_DEFINE(I_SYS_IN, , [sys/in.h])]) +AC_CHECK_HEADER(sys/mman.h, [AC_DEFINE(I_SYS_MMAN, , [sys/mman.h])]) +AC_CHECK_HEADER(sys/page.h, [AC_DEFINE(I_SYS_PAGE, , [sys/page.h])]) +AC_CHECK_HEADER(sys/param.h, [AC_DEFINE(I_SYS_PARAM, , [sys/param.h])]) +AC_CHECK_HEADER(sys/socket.h, [AC_DEFINE(I_SYS_SOCKET, , [sys/socket.h])]) +AC_CHECK_HEADER(sys/stat.h, [AC_DEFINE(I_SYS_STAT, , [sys/stat.h])]) +AC_CHECK_HEADER(sys/types.h, [AC_DEFINE(I_SYS_TYPES, , [sys/types.h])]) AC_CHECK_HEADERS([sys/un.h ieeefp.h sys/resource.h sys/event.h sys/uio.h]) AC_CHECK_HEADERS([poll.h sys/epoll.h sys/select.h sys/inotify.h fam.h]) AC_CHECK_HEADERS([zlib.h]) @@ -212,7 +207,7 @@ fi AX_CHECK_OPENSSL([ - AC_DEFINE(HAVE_SSL) + AC_DEFINE(HAVE_SSL, , [Check for OpenSSL Library]) HAVE_SSL="yes" ]) @@ -223,7 +218,7 @@ AC_ARG_ENABLE(zlib, AS_HELP_STRING([--disable-zlib], [Don't use zlib for databas # system libpcre AX_PATH_LIB_PCRE() if test "${PCRE_LIBS+set}" = "set"; then - AC_DEFINE(HAVE_PCRE) + AC_DEFINE(HAVE_PCRE, , [Check for system pcre]) fi ### Databases @@ -241,8 +236,8 @@ AC_MSG_NOTICE([Skipping SQL server checks]) fi ### Functions -AC_CHECK_FUNC(bindtextdomain, [AC_DEFINE(HAS_BINDTEXTDOMAIN)]) -AC_CHECK_FUNC(crypt, [AC_DEFINE(HAS_CRYPT)]) +AC_CHECK_FUNC(bindtextdomain, [AC_DEFINE(HAS_BINDTEXTDOMAIN, , [bindtextdomain function])]) +AC_CHECK_FUNC(crypt, [AC_DEFINE(HAS_CRYPT, , [Has system crypt])]) AC_CHECK_FUNCS([fpsetmask fpsetround]) AC_MSG_CHECKING([for isnormal]) AC_LINK_IFELSE([ @@ -252,21 +247,21 @@ int main(void) { } ], [AC_MSG_RESULT(yes)] -[AC_DEFINE(HAVE_ISNORMAL)], +[AC_DEFINE(HAVE_ISNORMAL, , [check for isnormal function in math.h])], AC_MSG_RESULT(no)) -AC_CHECK_FUNC(gai_strerror, [AC_DEFINE(HAS_GAI_STRERROR)]) -AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE(HAS_GETADDRINFO)]) -AC_CHECK_FUNC(getdate, [AC_DEFINE(HAS_GETDATE)]) -AC_CHECK_FUNC(gethostbyname2, [AC_DEFINE(HAS_GETHOSTBYNAME2)]) -AC_CHECK_FUNC(getnameinfo, [AC_DEFINE(HAS_GETNAMEINFO)]) -AC_CHECK_FUNC(getpagesize, [AC_DEFINE(HAS_GETPAGESIZE)]) -AC_CHECK_FUNC(getrlimit, [AC_DEFINE(HAS_GETRLIMIT)]) -AC_CHECK_FUNC(getrusage, [AC_DEFINE(HAS_GETRUSAGE)]) +AC_CHECK_FUNC(gai_strerror, [AC_DEFINE(HAS_GAI_STRERROR, , [has gai_strerror()])]) +AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE(HAS_GETADDRINFO, , [has getaddrinfo()])]) +AC_CHECK_FUNC(getdate, [AC_DEFINE(HAS_GETDATE, ,[has getdate()])]) +AC_CHECK_FUNC(gethostbyname2, [AC_DEFINE(HAS_GETHOSTBYNAME2, , [has gethostbyname2 function])]) +AC_CHECK_FUNC(getnameinfo, [AC_DEFINE(HAS_GETNAMEINFO, , [has getnameinfo])]) +AC_CHECK_FUNC(getpagesize, [AC_DEFINE(HAS_GETPAGESIZE, , [has getpagesize()])]) +AC_CHECK_FUNC(getrlimit, [AC_DEFINE(HAS_GETRLIMIT, , [has getrlimit function])]) +AC_CHECK_FUNC(getrusage, [AC_DEFINE(HAS_GETRUSAGE, , [has getrusage])]) AC_CHECK_FUNCS([gettext getpid getppid]) -AC_CHECK_FUNC(inet_pton, [AC_DEFINE(HAS_INET_PTON)]) -AC_CHECK_FUNC(setitimer, [AC_DEFINE(HAS_ITIMER)]) -AC_CHECK_FUNC(setlocale, [AC_DEFINE(HAS_SETLOCALE)]) +AC_CHECK_FUNC(inet_pton, [AC_DEFINE(HAS_INET_PTON, ,[has inet_pton])]) +AC_CHECK_FUNC(setitimer, [AC_DEFINE(HAS_ITIMER, , [has setitimer])]) +AC_CHECK_FUNC(setlocale, [AC_DEFINE(HAS_SETLOCALE, , [has setlocale])]) AC_FUNC_FORK AC_CHECK_FUNCS([setsid setpgid setpgrp]) if test $ac_cv_func_setpgrp = yes; then @@ -293,7 +288,7 @@ main(void) } ], [AC_MSG_RESULT(yes)] -[AC_DEFINE(HAVE_POSIX_FALLOCATE)], +[AC_DEFINE(HAVE_POSIX_FALLOCATE, , [check for posix_fallocate function in fcntl.h])], AC_MSG_RESULT(no)) AC_MSG_CHECKING([for posix_fadvise and associated constants]) AC_LINK_IFELSE([ @@ -308,23 +303,23 @@ main(void) } ], [AC_MSG_RESULT(yes)] -[AC_DEFINE(HAVE_POSIX_FADVISE)], +[AC_DEFINE(HAVE_POSIX_FADVISE, , [check for posix_fadvise function])], AC_MSG_RESULT(no)) AC_FUNC_SNPRINTF if test "x$ac_cv_have_working_snprintf" = xyes; then -AC_DEFINE(HAS_SNPRINTF) +AC_DEFINE(HAS_SNPRINTF, , [check for snprintf]) fi if test "x$ac_cv_have_working_vsnprintf" = xyes; then -AC_DEFINE(HAS_VSNPRINTF) +AC_DEFINE(HAS_VSNPRINTF, , [check for vsnprintf]) fi AC_CHECK_FUNCS([_vsnprintf_s vasprintf]) AC_CHECK_FUNCS([strcasecmp strncasecmp _stricmp _strnicmp strdup]) AC_FUNC_STRCOLL AC_CHECK_FUNCS([strxfrm _strncoll _stricoll _strnicoll strchrnul]) -AC_CHECK_FUNC(sysconf, [AC_DEFINE(HAS_SYSCONF)]) -AC_CHECK_FUNC(textdomain, [AC_DEFINE(HAS_TEXTDOMAIN)]) +AC_CHECK_FUNC(sysconf, [AC_DEFINE(HAS_SYSCONF, , [check for sysconf function])]) +AC_CHECK_FUNC(textdomain, [AC_DEFINE(HAS_TEXTDOMAIN, , [check for textdomain])]) AC_CHECK_FUNCS(waitpid) @@ -332,7 +327,7 @@ if test $ac_cv_func_waitpid = no; then AC_CHECK_FUNCS([wait3 wait]) AC_MSG_CHECKING([for union wait]) -AC_CHECK_TYPES([union wait], [AC_DEFINE(UNION_WAIT) +AC_CHECK_TYPES([union wait], [AC_DEFINE(UNION_WAIT, , [wait union exists]) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no), [AC_INCLUDES_DEFAULT #ifdef I_SYS_WAIT @@ -345,13 +340,13 @@ fi ### Variables, constants, defines and other misc. stuff -AC_CHECK_DECLS(h_errno, [AC_DEFINE(HAVE_H_ERRNO)],,[AC_INCLUDES_DEFAULT +AC_CHECK_DECLS(h_errno, [AC_DEFINE(HAVE_H_ERRNO, , [check for h_errno])],,[AC_INCLUDES_DEFAULT #ifdef I_NETDB #include #endif ]) -AC_CHECK_TYPES([struct sockaddr_in6], [AC_DEFINE(HAVE_SOCKADDR_IN6)],, +AC_CHECK_TYPES([struct sockaddr_in6], [AC_DEFINE(HAVE_SOCKADDR_IN6, , [check for struct sockaddr_in6])],, [AC_INCLUDES_DEFAULT #ifdef I_NETINET_IN #include @@ -370,38 +365,38 @@ else ], ac_safe_toupper=yes, ac_safe_toupper=no) AC_MSG_RESULT([$ac_safe_toupper]) if test "x$ac_safe_toupper" = xyes; then - AC_DEFINE(HAVE_SAFE_TOUPPER) + AC_DEFINE(HAVE_SAFE_TOUPPER, , [check for safe toupper]) fi # Which flavor of child killing to use? Prefer SIGCHLD. -AC_CHECK_DECLS(SIGCHLD, [AC_DEFINE(HAVE_SIGCHLD)],,[AC_INCLUDES_DEFAULT +AC_CHECK_DECLS(SIGCHLD, [AC_DEFINE(HAVE_SIGCHLD, , [check for SIGCHLD])],,[AC_INCLUDES_DEFAULT #include ]) -AC_CHECK_DECLS(SIGCLD, [AC_DEFINE(HAVE_SIGCLD)],,[AC_INCLUDES_DEFAULT +AC_CHECK_DECLS(SIGCLD, [AC_DEFINE(HAVE_SIGCLD, , [check for SIGCLD])],,[AC_INCLUDES_DEFAULT #include ]) ### Files -AC_CHECK_FILE(/dev/urandom, [AC_DEFINE(HAS_DEV_URANDOM)]) +AC_CHECK_FILE(/dev/urandom, [AC_DEFINE(HAS_DEV_URANDOM, , [Have /dev/urandom])]) ### Misc features AC_ARG_ENABLE(ipv6, AS_HELP_STRING([--disable-ipv6], [Don't use IPv6 networking]), enable_ipv6=$enableval, enable_ipv6=yes) if test "$enable_ipv6" = "no"; then -AC_DEFINE(FORCE_IPV4) +AC_DEFINE(FORCE_IPV4, , [Force IPV4]) fi AC_ARG_ENABLE(nls, AS_HELP_STRING([--disable-nls], [Don't use message-translation]), enable_nls=$enableval, enable_nls=yes) if test "$enable_nls" = "no"; then -AC_DEFINE(DONT_TRANSLATE) +AC_DEFINE(DONT_TRANSLATE, , [Don't use translation messages]) fi AC_ARG_ENABLE(info_slave, AS_HELP_STRING([--disable-info_slave], @@ -409,7 +404,7 @@ AC_ARG_ENABLE(info_slave, AS_HELP_STRING([--disable-info_slave], enable_info_slave=$enableval, enable_info_slave=yes) if test "$enable_info_slave" = yes; then AC_SUBST(INFO_SLAVE_TARGET, info_slave) - AC_DEFINE(INFO_SLAVE) + AC_DEFINE(INFO_SLAVE, , [INFO_SLAVE]) fi AC_ARG_ENABLE(sse2, AS_HELP_STRING([--enable-sse2], @@ -420,18 +415,18 @@ AC_ARG_ENABLE(altivec, AS_HELP_STRING([--enable-altivec], [Use PowerPC Altivec instructions (Requires a CPU that supports Altivec)])) if test "$enable_sse2" = yes; then - AC_DEFINE(HAVE_SSE2) + AC_DEFINE(HAVE_SSE2, , [SSE2]) CFLAGS="$CFLAGS -msse2" fi if test "$enable_sse3" = yes; then - AC_DEFINE(HAVE_SSE2) - AC_DEFINE(HAVE_SSE3) + AC_DEFINE(HAVE_SSE2, ,[SSE2]) + AC_DEFINE(HAVE_SSE3, , [SSE3]) CFLAGS="$CFLAGS -msse2 -msse3" fi if test "$enable_altivec" = yes; then - AC_DEFINE(HAVE_ALTIVEC) + AC_DEFINE(HAVE_ALTIVEC, , [HAVE_ALTIVEC]) CFLAGS="$CFLAGS -maltivec -faltivec" fi -- 2.30.2