*** pgsql/configure	2003/09/12 02:04:39	1.289.2.7
--- pgsql/configure	2003/08/16 15:35:49	1.290
***************
*** 1,6 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.53 for PostgreSQL 7.4beta2.
  #
  # Report bugs to <pgsql-bugs@postgresql.org>.
  #
--- 1,6 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.53 for PostgreSQL 7.4beta1.
  #
  # Report bugs to <pgsql-bugs@postgresql.org>.
  #
*************** SHELL=${CONFIG_SHELL-/bin/sh}
*** 258,265 ****
  # Identity of this package.
  PACKAGE_NAME='PostgreSQL'
  PACKAGE_TARNAME='postgresql'
! PACKAGE_VERSION='7.4beta2'
! PACKAGE_STRING='PostgreSQL 7.4beta2'
  PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
  
  ac_unique_file="src/backend/access/common/heaptuple.c"
--- 258,265 ----
  # Identity of this package.
  PACKAGE_NAME='PostgreSQL'
  PACKAGE_TARNAME='postgresql'
! PACKAGE_VERSION='7.4beta1'
! PACKAGE_STRING='PostgreSQL 7.4beta1'
  PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
  
  ac_unique_file="src/backend/access/common/heaptuple.c"
*************** if test "$ac_init_help" = "long"; then
*** 769,775 ****
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures PostgreSQL 7.4beta2 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
--- 769,775 ----
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
! \`configure' configures PostgreSQL 7.4beta1 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
*************** fi
*** 830,836 ****
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of PostgreSQL 7.4beta2:";;
     esac
    cat <<\_ACEOF
  
--- 830,836 ----
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
!      short | recursive ) echo "Configuration of PostgreSQL 7.4beta1:";;
     esac
    cat <<\_ACEOF
  
*************** Optional Packages:
*** 860,866 ****
    --with-tclconfig=DIR    tclConfig.sh and tkConfig.sh are in DIR
    --with-tkconfig=DIR     tkConfig.sh is in DIR
    --with-perl             build Perl modules (PL/Perl)
!   --with-python           build Python modules (PL/Python)
    --with-java             build JDBC interface and Java tools
    --with-krb4[=DIR]       build with Kerberos 4 support [/usr/athena]
    --with-krb5[=DIR]       build with Kerberos 5 support [/usr/athena]
--- 860,866 ----
    --with-tclconfig=DIR    tclConfig.sh and tkConfig.sh are in DIR
    --with-tkconfig=DIR     tkConfig.sh is in DIR
    --with-perl             build Perl modules (PL/Perl)
!   --with-python           build Python interface module
    --with-java             build JDBC interface and Java tools
    --with-krb4[=DIR]       build with Kerberos 4 support [/usr/athena]
    --with-krb5[=DIR]       build with Kerberos 5 support [/usr/athena]
*************** fi
*** 949,955 ****
  test -n "$ac_init_help" && exit 0
  if $ac_init_version; then
    cat <<\_ACEOF
! PostgreSQL configure 7.4beta2
  generated by GNU Autoconf 2.53
  
  Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--- 949,955 ----
  test -n "$ac_init_help" && exit 0
  if $ac_init_version; then
    cat <<\_ACEOF
! PostgreSQL configure 7.4beta1
  generated by GNU Autoconf 2.53
  
  Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
*************** cat >&5 <<_ACEOF
*** 966,972 ****
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by PostgreSQL $as_me 7.4beta2, which was
  generated by GNU Autoconf 2.53.  Invocation command line was
  
    $ $0 $@
--- 966,972 ----
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
! It was created by PostgreSQL $as_me 7.4beta1, which was
  generated by GNU Autoconf 2.53.  Invocation command line was
  
    $ $0 $@
*************** fi
*** 2370,2381 ****
  { echo "$as_me:$LINENO: using CFLAGS=$CFLAGS" >&5
  echo "$as_me: using CFLAGS=$CFLAGS" >&6;}
  
- # We already have this in Makefile.win32, but configure needs it too
- if test "$PORTNAME" = "win32"
- then
- 	CPPFLAGS="$CPPFLAGS -I$srcdir/src/include/port/win32"
- fi
- 
  # Check if the compiler still works with the template settings
  echo "$as_me:$LINENO: checking whether the C compiler still works" >&5
  echo $ECHO_N "checking whether the C compiler still works... $ECHO_C" >&6
--- 2370,2375 ----
*************** echo "${ECHO_T}$with_perl" >&6
*** 2987,2993 ****
  
  
  #
! # Optionally build Python modules (PL/Python)
  #
  echo "$as_me:$LINENO: checking whether to build Python modules" >&5
  echo $ECHO_N "checking whether to build Python modules... $ECHO_C" >&6
--- 2981,2987 ----
  
  
  #
! # Optionally build Python interface module
  #
  echo "$as_me:$LINENO: checking whether to build Python modules" >&5
  echo $ECHO_N "checking whether to build Python modules... $ECHO_C" >&6
*************** python_version=`${PYTHON} -c "import sys
*** 4300,4305 ****
--- 4294,4301 ----
  python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
  python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
  python_configdir="${python_execprefix}/lib/python${python_version}/config"
+ python_moduledir="${python_prefix}/lib/python${python_version}/site-packages"
+ python_moduleexecdir="${python_execprefix}/lib/python${python_version}/site-packages"
  python_includespec="-I${python_prefix}/include/python${python_version}"
  if test "$python_prefix" != "$python_execprefix"; then
    python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
*************** echo "${ECHO_T}$python_prefix/lib/python
*** 4315,4320 ****
--- 4311,4319 ----
  fi
  
  
+ 
+ 
+ 
  echo "$as_me:$LINENO: checking how to link an embedded Python application" >&5
  echo $ECHO_N "checking how to link an embedded Python application... $ECHO_C" >&6
  
*************** _ACEOF
*** 10816,10838 ****
  fi
  echo "$as_me:$LINENO: checking types of arguments for accept()" >&5
  echo $ECHO_N "checking types of arguments for accept()... $ECHO_C" >&6
!  if test "${ac_cv_func_accept_return+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!    if test "${ac_cv_func_accept_arg1+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!     if test "${ac_cv_func_accept_arg2+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!      if test "${ac_cv_func_accept_arg3+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!       for ac_cv_func_accept_return in 'int' 'unsigned int PASCAL'; do
!       for ac_cv_func_accept_arg1 in 'int' 'unsigned int'; do
!        for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do
!         for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int' 'void'; do
!          cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
  #ifdef HAVE_SYS_TYPES_H
--- 10815,10833 ----
  fi
  echo "$as_me:$LINENO: checking types of arguments for accept()" >&5
  echo $ECHO_N "checking types of arguments for accept()... $ECHO_C" >&6
!  if test "${ac_cv_func_accept_arg1+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!    if test "${ac_cv_func_accept_arg2+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!     if test "${ac_cv_func_accept_arg3+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!      for ac_cv_func_accept_arg1 in 'int' 'unsigned int'; do
!      for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'const struct sockaddr *' 'void *'; do
!       for ac_cv_func_accept_arg3 in 'int' 'size_t' 'socklen_t' 'unsigned int' 'void'; do
!        cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
  #ifdef HAVE_SYS_TYPES_H
*************** else
*** 10841,10847 ****
  #ifdef HAVE_SYS_SOCKET_H
  #include <sys/socket.h>
  #endif
! extern $ac_cv_func_accept_return accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *);
  #ifdef F77_DUMMY_MAIN
  #  ifdef __cplusplus
       extern "C"
--- 10836,10842 ----
  #ifdef HAVE_SYS_SOCKET_H
  #include <sys/socket.h>
  #endif
! extern int accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *);
  #ifdef F77_DUMMY_MAIN
  #  ifdef __cplusplus
       extern "C"
*************** if { (eval echo "$as_me:$LINENO: \"$ac_c
*** 10868,10881 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_not_found=no; break 4
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  ac_not_found=yes
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
-        done
        done
       done
      done
--- 10863,10875 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_not_found=no; break 3
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  ac_not_found=yes
  fi
  rm -f conftest.$ac_objext conftest.$ac_ext
        done
       done
      done
*************** fi
*** 10893,10907 ****
  fi
  
  fi
! 
! fi
!  echo "$as_me:$LINENO: result: $ac_cv_func_accept_return, $ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *" >&5
! echo "${ECHO_T}$ac_cv_func_accept_return, $ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *" >&6
! 
! cat >>confdefs.h <<_ACEOF
! #define ACCEPT_TYPE_RETURN $ac_cv_func_accept_return
! _ACEOF
! 
  
  cat >>confdefs.h <<_ACEOF
  #define ACCEPT_TYPE_ARG1 $ac_cv_func_accept_arg1
--- 10887,10894 ----
  fi
  
  fi
!  echo "$as_me:$LINENO: result: $ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *" >&5
! echo "${ECHO_T}$ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3 *" >&6
  
  cat >>confdefs.h <<_ACEOF
  #define ACCEPT_TYPE_ARG1 $ac_cv_func_accept_arg1
*************** fi
*** 11211,11217 ****
  
  
  
- HAVE_IPV6=no
  echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5
  echo $ECHO_N "checking for struct sockaddr_in6... $ECHO_C" >&6
  if test "${ac_cv_type_struct_sockaddr_in6+set}" = set; then
--- 11198,11203 ----
*************** cat >>confdefs.h <<\_ACEOF
*** 11333,11345 ****
  #define HAVE_IPV6 1
  _ACEOF
  
- 							  HAVE_IPV6=yes
  fi
  
  fi
  
  
- 
  echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
  echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6
  if test "${pgac_cv_var_PS_STRINGS+set}" = set; then
--- 11319,11329 ----
*************** _ASBOX
*** 17995,18001 ****
  } >&5
  cat >&5 <<_CSEOF
  
! This file was extended by PostgreSQL $as_me 7.4beta2, which was
  generated by GNU Autoconf 2.53.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
--- 17979,17985 ----
  } >&5
  cat >&5 <<_CSEOF
  
! This file was extended by PostgreSQL $as_me 7.4beta1, which was
  generated by GNU Autoconf 2.53.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
*************** _ACEOF
*** 18057,18063 ****
  
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! PostgreSQL config.status 7.4beta2
  configured by $0, generated by GNU Autoconf 2.53,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  
--- 18041,18047 ----
  
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
! PostgreSQL config.status 7.4beta1
  configured by $0, generated by GNU Autoconf 2.53,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  
*************** s,@perl_privlibexp@,$perl_privlibexp,;t
*** 18301,18313 ****
  s,@perl_useshrplib@,$perl_useshrplib,;t t
  s,@perl_embed_ldflags@,$perl_embed_ldflags,;t t
  s,@PYTHON@,$PYTHON,;t t
  s,@python_prefix@,$python_prefix,;t t
  s,@python_execprefix@,$python_execprefix,;t t
  s,@python_configdir@,$python_configdir,;t t
  s,@python_includespec@,$python_includespec,;t t
  s,@python_libspec@,$python_libspec,;t t
  s,@LIBOBJS@,$LIBOBJS,;t t
- s,@HAVE_IPV6@,$HAVE_IPV6,;t t
  s,@THREAD_CFLAGS@,$THREAD_CFLAGS,;t t
  s,@THREAD_LIBS@,$THREAD_LIBS,;t t
  s,@HAVE_POSIX_SIGNALS@,$HAVE_POSIX_SIGNALS,;t t
--- 18285,18299 ----
  s,@perl_useshrplib@,$perl_useshrplib,;t t
  s,@perl_embed_ldflags@,$perl_embed_ldflags,;t t
  s,@PYTHON@,$PYTHON,;t t
+ s,@python_version@,$python_version,;t t
  s,@python_prefix@,$python_prefix,;t t
  s,@python_execprefix@,$python_execprefix,;t t
  s,@python_configdir@,$python_configdir,;t t
+ s,@python_moduledir@,$python_moduledir,;t t
+ s,@python_moduleexecdir@,$python_moduleexecdir,;t t
  s,@python_includespec@,$python_includespec,;t t
  s,@python_libspec@,$python_libspec,;t t
  s,@LIBOBJS@,$LIBOBJS,;t t
  s,@THREAD_CFLAGS@,$THREAD_CFLAGS,;t t
  s,@THREAD_LIBS@,$THREAD_LIBS,;t t
  s,@HAVE_POSIX_SIGNALS@,$HAVE_POSIX_SIGNALS,;t t