|
|
| version 1.267, 2003/06/23 23:51:59 | version 1.277, 2003/08/04 22:30:30 |
|---|---|
| Line 21 dnl The GNU folks apparently haven't hea | Line 21 dnl The GNU folks apparently haven't hea |
| dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". | dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". |
| m4_define([info], [doc]) | m4_define([info], [doc]) |
| m4_define([infodir], [docdir]) | m4_define([infodir], [docdir]) |
| AC_INIT([PostgreSQL], [7.4devel], [[email protected]]) | AC_INIT([PostgreSQL], [7.4beta1], [[email protected]]) |
| m4_undefine([infodir]) | m4_undefine([infodir]) |
| m4_undefine([info]) | m4_undefine([info]) |
| AC_SUBST(docdir) | AC_SUBST(docdir) |
| AC_PREREQ(2.53) | AC_PREREQ(2.53) |
| AC_COPYRIGHT([Copyright 2002 PostgreSQL Global Development Group]) | AC_COPYRIGHT([Copyright 2003 PostgreSQL Global Development Group]) |
| AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) | AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) |
| AC_CONFIG_AUX_DIR(config) | AC_CONFIG_AUX_DIR(config) |
| AC_PREFIX_DEFAULT(/usr/local/pgsql) | AC_PREFIX_DEFAULT(/usr/local/pgsql) |
| Line 108 AC_SUBST(PORTNAME) | Line 108 AC_SUBST(PORTNAME) |
| # assembler code in src/include/storage/s_lock.h, so we just use | # assembler code in src/include/storage/s_lock.h, so we just use |
| # a dummy file here. | # a dummy file here. |
| case $host in | case $host in |
| *-*-hpux*) need_tas=yes; tas_file=hpux.s ;; | hppa*-*-hpux*) need_tas=yes; tas_file=hpux_hppa.s ;; |
| sparc-*-solaris*) need_tas=yes; tas_file=solaris_sparc.s ;; | sparc-*-solaris*) need_tas=yes; tas_file=solaris_sparc.s ;; |
| i?86-*-solaris*) need_tas=yes; tas_file=solaris_i386.s ;; | i?86-*-solaris*) need_tas=yes; tas_file=solaris_i386.s ;; |
| *) need_tas=no; tas_file=dummy.s ;; | *) need_tas=no; tas_file=dummy.s ;; |
| Line 153 PGAC_ARG_BOOL(enable, integer-datetimes, | Line 153 PGAC_ARG_BOOL(enable, integer-datetimes, |
| AC_MSG_RESULT([$enable_integer_datetimes]) | AC_MSG_RESULT([$enable_integer_datetimes]) |
| # Character set recode (--enable-recode) | |
| # | |
| AC_MSG_CHECKING([whether to build with recode support]) | |
| PGAC_ARG_BOOL(enable, recode, no, [ --enable-recode enable single-byte recode support], | |
| [AC_DEFINE([CYR_RECODE], 1, | |
| [Define to 1 if you want single-byte recode support. (--enable-recode)])]) | |
| AC_MSG_RESULT([$enable_recode]) | |
| # | # |
| # NLS | # NLS |
| # | # |
| Line 320 done | Line 311 done |
| IFS=$ac_save_IFS | IFS=$ac_save_IFS |
| # | # |
| # Enable libpq to be thread-safe | # Enable libpq to be thread-safety |
| # | # |
| AC_MSG_CHECKING([allow threaded libpq]) | AC_MSG_CHECKING([allow thread-safe libpq and ecpg]) |
| PGAC_ARG_BOOL(with, threads, no, [ --with-threads allow libpq and ecpg to be thread-safe], | PGAC_ARG_BOOL(enable, thread-safety, no, [ --enable-thread-safety allow libpq and ecpg to be thread-safe], |
| [AC_DEFINE([USE_THREADS], 1, [Define to 1 to build libpq and ecpg to be thread-safe. (--with-threads)])]) | [AC_DEFINE([USE_THREADS], 1, [Define to 1 to build libpq and ecpg to be thread-safe. (--enable-thread-safety)])]) |
| AC_MSG_RESULT([$enable_thread_safety]) | |
| AC_MSG_RESULT([$with_threads]) | AC_SUBST(enable_thread_safety) |
| AC_SUBST(with_threads) | |
| # | # |
| # Tcl/Tk | # Tcl/Tk |
| Line 647 AC_SEARCH_LIBS(getopt_long, [getopt gnug | Line 637 AC_SEARCH_LIBS(getopt_long, [getopt gnug |
| AC_CHECK_LIB(unix, main) | AC_CHECK_LIB(unix, main) |
| AC_SEARCH_LIBS(crypt, crypt) | AC_SEARCH_LIBS(crypt, crypt) |
| # BeOS: | # BeOS: |
| AC_CHECK_LIB(bind, __inet_ntoa) | if test "$PORTNAME" = "beos" |
| then | |
| AC_CHECK_LIB(bind, __inet_ntoa) | |
| fi | |
| # Solaris: | # Solaris: |
| AC_SEARCH_LIBS(fdatasync, [rt posix4]) | AC_SEARCH_LIBS(fdatasync, [rt posix4]) |
| # Cygwin: | # Cygwin: |
| Line 778 PGAC_STRUCT_TIMEZONE | Line 771 PGAC_STRUCT_TIMEZONE |
| PGAC_UNION_SEMUN | PGAC_UNION_SEMUN |
| PGAC_STRUCT_SOCKADDR_UN | PGAC_STRUCT_SOCKADDR_UN |
| PGAC_STRUCT_SOCKADDR_STORAGE | PGAC_STRUCT_SOCKADDR_STORAGE |
| PGAC_STRUCT_SOCKADDR_STORAGE_SS_FAMILY | PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS |
| PGAC_STRUCT_ADDRINFO | PGAC_STRUCT_ADDRINFO |
| AC_CHECK_TYPES([struct cmsgcred, struct fcred, struct sockcred], [], [], | AC_CHECK_TYPES([struct cmsgcred, struct fcred, struct sockcred], [], [], |
| Line 965 AC_FUNC_FSEEKO | Line 958 AC_FUNC_FSEEKO |
| # For each platform, we need to know about any special compile and link | # For each platform, we need to know about any special compile and link |
| # libraries, and whether the normal C function names are thread-safe. | # libraries, and whether the normal C function names are thread-safe. |
| # | # |
| NEED_REENTRANT_FUNC_NAMES=no | if test "$enable_thread_safety" = yes; then |
| if test "$with_threads" = yes; then | |
| AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([pthread.h not found, required for --with-threads])]) | AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([pthread.h not found, required for --with-threads])]) |
| if test "$SUPPORTS_THREADS" != yes; then | if test "$SUPPORTS_THREADS" != yes; then |
| AC_MSG_ERROR([ | AC_MSG_ERROR([ |
| Cannot enable threads on your platform. | Cannot enable threads on your platform. |
| Please report your platform threading info to the PostgreSQL mailing lists | Please report your platform threading info to the PostgreSQL mailing lists |
| so it can be added to the next release. Report any compile flags, link flags, | so it can be added to the next release. Report all compile flags, link flags, |
| functions, or libraries required for threading support. | functions, or libraries required for threading support. |
| ]) | ]) |
| fi | fi |
| else | |
| # do not use values from template file | |
| THREAD_CFLAGS= | |
| THREAD_LIBS= | |
| fi | fi |
| AC_SUBST(THREAD_CFLAGS) | AC_SUBST(THREAD_CFLAGS) |
| AC_SUBST(THREAD_LIBS) | AC_SUBST(THREAD_LIBS) |
| Line 989 AC_SUBST(THREAD_LIBS) | Line 985 AC_SUBST(THREAD_LIBS) |
| # threading on this platform. Some platforms have *_r functions but | # threading on this platform. Some platforms have *_r functions but |
| # their natively named funcs are threadsafe, and should be used instead. | # their natively named funcs are threadsafe, and should be used instead. |
| # | # |
| # One trick here is that if the don't call AC_CHECK_FUNCS, the | # One trick here is that if we don't call AC_CHECK_FUNCS, the |
| # functions are marked "not found", which is perfect. | # functions are marked "not found", which is perfect. |
| # | # |
| if test "$NEED_REENTRANT_FUNC_NAMES" = yes ; then | if test "$enable_thread_safety" = yes -a "$NEED_REENTRANT_FUNC_NAMES" = yes ; then |
| _CFLAGS="$CFLAGS" | _CFLAGS="$CFLAGS" |
| _LIB="$LIBS" | _LIBS="$LIBS" |
| CFLAGS="$CFLAGS $TREAD_CFLAGS" | CFLAGS="$CFLAGS $THREAD_CFLAGS" |
| LIBS="$LIBS $THREAD_LIBS" | LIBS="$LIBS $THREAD_LIBS" |
| AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r]) | AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r]) |
| CFLAGS="$_CFLAGS" | CFLAGS="$_CFLAGS" |
| LIB="$_LIBS" | LIBS="$_LIBS" |
| fi | fi |