Okay, that does it for tonight...
Cleaned out alot of the #define that can be auto-detect'd by configure from config.h...
This commit is contained in:
parent
ca6da613cd
commit
a245ba7cb7
|
@ -96,7 +96,7 @@ dnl Checks for header files.
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
AC_HEADER_SYS_WAIT
|
AC_HEADER_SYS_WAIT
|
||||||
AC_CHECK_HEADERS(fcntl.h limits.h sys/file.h sys/ioctl.h sys/time.h unistd.h)
|
AC_CHECK_HEADERS(fcntl.h limits.h sys/file.h sys/ioctl.h sys/time.h unistd.h)
|
||||||
AC_CHECK_HEADERS(termios.h values.h)
|
AC_CHECK_HEADERS(termios.h values.h sys/select.h)
|
||||||
|
|
||||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
|
@ -114,6 +114,6 @@ AC_FUNC_MEMCMP
|
||||||
AC_TYPE_SIGNAL
|
AC_TYPE_SIGNAL
|
||||||
AC_FUNC_VPRINTF
|
AC_FUNC_VPRINTF
|
||||||
AC_CHECK_FUNCS(ftime getcwd gethostname gettimeofday putenv regcomp select socket strcspn strdup strerror strftime strspn strtod strtol)
|
AC_CHECK_FUNCS(ftime getcwd gethostname gettimeofday putenv regcomp select socket strcspn strdup strerror strftime strspn strtod strtol)
|
||||||
AC_CHECK_FUNCS(isinf tzset cbrt)
|
AC_CHECK_FUNCS(isinf tzset cbrt rint rusage vfork memmove)
|
||||||
|
|
||||||
AC_OUTPUT(GNUmakefile Makefile.global bin/psql/Makefile)
|
AC_OUTPUT(GNUmakefile Makefile.global bin/psql/Makefile)
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* include/config.h. Generated automatically by configure. */
|
||||||
/* the purpose of this file is to reduce the use of #ifdef's through
|
/* the purpose of this file is to reduce the use of #ifdef's through
|
||||||
* the code base by those porting the software, and to facilitate the
|
* the code base by those porting the software, and to facilitate the
|
||||||
* eventual use of autoconf to build the server
|
* eventual use of autoconf to build the server
|
||||||
|
@ -8,25 +9,63 @@
|
||||||
|
|
||||||
#define BLCKSZ 8192
|
#define BLCKSZ 8192
|
||||||
|
|
||||||
#if defined(aix)
|
/*
|
||||||
#define TERMIOS_H_LOCATION <termios.h>
|
* The following is set using configure.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Set to 1 if you have <termios.h> */
|
||||||
|
#define HAVE_TERMIOS_H 1
|
||||||
|
|
||||||
|
/* Set to 1 if you have <limits.h> */
|
||||||
|
#define HAVE_LIMITS_H 1
|
||||||
|
|
||||||
|
/* Set to 1 if you have <values.h> */
|
||||||
|
/* #undef HAVE_VALUES_H */
|
||||||
|
|
||||||
|
/* Set to 1 if you have isinf() */
|
||||||
|
#define HAVE_ISINF 1
|
||||||
|
|
||||||
|
/* Set to 1 if you have tzset() */
|
||||||
|
#define HAVE_TZSET 1
|
||||||
|
|
||||||
|
/* Set to 1 if you have cbrt() */
|
||||||
|
/* #undef HAVE_CBRT */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Code below this point should not require changes
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if defined(HAVE_TERMIOS_H)
|
||||||
|
# define TERMIOS_H_LOCATION <termios.h>
|
||||||
#else
|
#else
|
||||||
#define TERMIOS_H_LOCATION <sys/termios.h>
|
# define TERMIOS_H_LOCATION <sys/termios.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(nextstep)
|
/* Temporary: Need to change source files from USE_VALUES_H to HAVE_VALUES_H */
|
||||||
|
#if defined(HAVE_VALUES_H)
|
||||||
#define USE_VALUES_H
|
#define USE_VALUES_H
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Temporary: Need to change source files from USE_LIMITS_H to HAVE_LIMITS_H */
|
||||||
|
#if defined(HAVE_LIMITS_H)
|
||||||
|
# define USE_LIMITS_H
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(HAVE_ISINF)
|
||||||
|
# define NEED_ISINF
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(HAVE_CBRT)
|
||||||
|
# define NEED_CBRT
|
||||||
|
#endif
|
||||||
|
|
||||||
#define HAVE_MEMMOVE
|
#define HAVE_MEMMOVE
|
||||||
|
|
||||||
#if defined(aix)
|
#if defined(aix)
|
||||||
# define CLASS_CONFLICT
|
# define CLASS_CONFLICT
|
||||||
# define DISABLE_XOPEN_NLS
|
# define DISABLE_XOPEN_NLS
|
||||||
# define NEED_ISINF
|
|
||||||
# define NEED_UNION_SEMUN
|
# define NEED_UNION_SEMUN
|
||||||
# define NEED_SYS_SELECT_H
|
# define NEED_SYS_SELECT_H
|
||||||
# define HAVE_TZSET
|
|
||||||
# define HAVE_ANSI_CPP
|
# define HAVE_ANSI_CPP
|
||||||
# define HAS_TEST_AND_SET
|
# define HAS_TEST_AND_SET
|
||||||
typedef unsigned int slock_t;
|
typedef unsigned int slock_t;
|
||||||
|
@ -36,7 +75,6 @@
|
||||||
# define USE_POSIX_TIME
|
# define USE_POSIX_TIME
|
||||||
# define USE_POSIX_SIGNALS
|
# define USE_POSIX_SIGNALS
|
||||||
# define DISABLE_XOPEN_NLS
|
# define DISABLE_XOPEN_NLS
|
||||||
# define NEED_ISINF
|
|
||||||
# define HAS_LONG_LONG
|
# define HAS_LONG_LONG
|
||||||
# define NEED_UNION_SEMUN
|
# define NEED_UNION_SEMUN
|
||||||
# define HAS_TEST_AND_SET
|
# define HAS_TEST_AND_SET
|
||||||
|
@ -45,13 +83,11 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(BSD44_derived)
|
#if defined(BSD44_derived)
|
||||||
# define USE_LIMITS_H
|
|
||||||
# define USE_POSIX_TIME
|
# define USE_POSIX_TIME
|
||||||
# define NEED_CBRT
|
|
||||||
# define NEED_I386_TAS_ASM
|
# define NEED_I386_TAS_ASM
|
||||||
# define HAS_TEST_AND_SET
|
# define HAS_TEST_AND_SET
|
||||||
# if defined(__mips__)
|
# if defined(__mips__)
|
||||||
# undef HAS_TEST_AND_SET
|
/* # undef HAS_TEST_AND_SET */
|
||||||
# endif
|
# endif
|
||||||
typedef unsigned char slock_t;
|
typedef unsigned char slock_t;
|
||||||
#endif
|
#endif
|
||||||
|
@ -66,9 +102,7 @@
|
||||||
# if defined(PRE_BSDI_2_1)
|
# if defined(PRE_BSDI_2_1)
|
||||||
# define NEED_UNION_SEMUN
|
# define NEED_UNION_SEMUN
|
||||||
# endif
|
# endif
|
||||||
# define USE_LIMITS_H
|
|
||||||
# define USE_POSIX_TIME
|
# define USE_POSIX_TIME
|
||||||
# define NEED_CBRT
|
|
||||||
# define HAS_TEST_AND_SET
|
# define HAS_TEST_AND_SET
|
||||||
typedef unsigned char slock_t;
|
typedef unsigned char slock_t;
|
||||||
#endif
|
#endif
|
||||||
|
@ -83,8 +117,6 @@
|
||||||
#if defined(hpux)
|
#if defined(hpux)
|
||||||
# define JMP_BUF
|
# define JMP_BUF
|
||||||
# define USE_POSIX_TIME
|
# define USE_POSIX_TIME
|
||||||
# define HAVE_TZSET
|
|
||||||
# define NEED_CBRT
|
|
||||||
# define NEED_RINT
|
# define NEED_RINT
|
||||||
# define NEED_UNION_SEMUN
|
# define NEED_UNION_SEMUN
|
||||||
# define HAS_TEST_AND_SET
|
# define HAS_TEST_AND_SET
|
||||||
|
@ -92,13 +124,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(i386_solaris)
|
#if defined(i386_solaris)
|
||||||
# define USE_LIMITS_H
|
|
||||||
# define USE_POSIX_TIME
|
# define USE_POSIX_TIME
|
||||||
# define USE_POSIX_SIGNALS
|
# define USE_POSIX_SIGNALS
|
||||||
# define NEED_ISINF
|
|
||||||
# define NEED_RUSAGE
|
# define NEED_RUSAGE
|
||||||
# define NO_EMPTY_STMTS
|
# define NO_EMPTY_STMTS
|
||||||
# define HAVE_TZSET
|
|
||||||
# define NEED_UNION_SEMUN
|
# define NEED_UNION_SEMUN
|
||||||
# define SYSV_DIRENT
|
# define SYSV_DIRENT
|
||||||
# define HAS_TEST_AND_SET
|
# define HAS_TEST_AND_SET
|
||||||
|
@ -108,10 +137,8 @@
|
||||||
#if defined(irix5)
|
#if defined(irix5)
|
||||||
# define USE_POSIX_TIME
|
# define USE_POSIX_TIME
|
||||||
# define USE_POSIX_SIGNALS
|
# define USE_POSIX_SIGNALS
|
||||||
# define NEED_ISINF
|
|
||||||
# define NO_EMPTY_STMTS
|
# define NO_EMPTY_STMTS
|
||||||
# define NO_VFORK
|
# define NO_VFORK
|
||||||
# define HAVE_TZSET
|
|
||||||
# define SYSV_DIRENT
|
# define SYSV_DIRENT
|
||||||
# define HAS_TEST_AND_SET
|
# define HAS_TEST_AND_SET
|
||||||
# include <abi_mutex.h>
|
# include <abi_mutex.h>
|
||||||
|
@ -127,8 +154,6 @@
|
||||||
*/
|
*/
|
||||||
# define JMP_BUF
|
# define JMP_BUF
|
||||||
# define USE_POSIX_TIME
|
# define USE_POSIX_TIME
|
||||||
# define HAVE_TZSET
|
|
||||||
# define NEED_CBRT
|
|
||||||
# define NEED_I386_TAS_ASM
|
# define NEED_I386_TAS_ASM
|
||||||
# define HAS_TEST_AND_SET
|
# define HAS_TEST_AND_SET
|
||||||
typedef unsigned char slock_t;
|
typedef unsigned char slock_t;
|
||||||
|
@ -152,7 +177,6 @@
|
||||||
# define NEED_SIG_JMP
|
# define NEED_SIG_JMP
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# define USE_LIMITS_H
|
|
||||||
# define JMP_BUF
|
# define JMP_BUF
|
||||||
# define NO_WAITPID
|
# define NO_WAITPID
|
||||||
typedef struct mutex slock_t;
|
typedef struct mutex slock_t;
|
||||||
|
@ -163,14 +187,11 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(sparc_solaris)
|
#if defined(sparc_solaris)
|
||||||
# define USE_LIMITS_H
|
|
||||||
# define USE_POSIX_TIME
|
# define USE_POSIX_TIME
|
||||||
# define USE_POSIX_SIGNALS
|
# define USE_POSIX_SIGNALS
|
||||||
# define NEED_ISINF
|
|
||||||
# define NEED_RUSAGE
|
# define NEED_RUSAGE
|
||||||
# define NO_EMPTY_STMTS
|
# define NO_EMPTY_STMTS
|
||||||
# define USE_POSIX_TIME
|
# define USE_POSIX_TIME
|
||||||
# define HAVE_TZSET
|
|
||||||
# define NEED_UNION_SEMUN
|
# define NEED_UNION_SEMUN
|
||||||
# define SYSV_DIRENT
|
# define SYSV_DIRENT
|
||||||
# define HAS_TEST_AND_SET
|
# define HAS_TEST_AND_SET
|
||||||
|
@ -179,16 +200,14 @@ typedef unsigned char slock_t;
|
||||||
|
|
||||||
#if defined(sunos4)
|
#if defined(sunos4)
|
||||||
# define USE_POSIX_TIME
|
# define USE_POSIX_TIME
|
||||||
# undef HAVE_MEMMOVE
|
/* # undef HAVE_MEMMOVE */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(svr4)
|
#if defined(svr4)
|
||||||
# define USE_POSIX_TIME
|
# define USE_POSIX_TIME
|
||||||
# define USE_POSIX_SIGNALS
|
# define USE_POSIX_SIGNALS
|
||||||
# define NEED_ISINF
|
|
||||||
# define NEED_RUSAGE
|
# define NEED_RUSAGE
|
||||||
# define NO_EMPTY_STMTS
|
# define NO_EMPTY_STMTS
|
||||||
# define HAVE_TZSET
|
|
||||||
# define NEED_UNION_SEMUN
|
# define NEED_UNION_SEMUN
|
||||||
# define SYSV_DIRENT
|
# define SYSV_DIRENT
|
||||||
#endif
|
#endif
|
||||||
|
@ -200,16 +219,12 @@ typedef unsigned char slock_t;
|
||||||
# define USES_WINSOCK
|
# define USES_WINSOCK
|
||||||
# define NOFILE 100
|
# define NOFILE 100
|
||||||
# define NEED_UNION_SEMUN
|
# define NEED_UNION_SEMUN
|
||||||
# define HAVE_TZSET
|
|
||||||
# define NEED_CBRT
|
|
||||||
# define NEED_ISINF
|
|
||||||
# ifndef MAXPATHLEN
|
# ifndef MAXPATHLEN
|
||||||
# define MAXPATHLEN 250
|
# define MAXPATHLEN 250
|
||||||
# endif
|
# endif
|
||||||
#endif /* WIN32 */
|
#endif /* WIN32 */
|
||||||
|
|
||||||
#if defined(ultrix4)
|
#if defined(ultrix4)
|
||||||
# define NEED_ISINF
|
|
||||||
# define USE_POSIX_TIME
|
# define USE_POSIX_TIME
|
||||||
# define NEED_UNION_SEMUN
|
# define NEED_UNION_SEMUN
|
||||||
# define NEED_STRDUP
|
# define NEED_STRDUP
|
||||||
|
|
Loading…
Reference in New Issue