[Python-checkins] CVS: python/dist/src configure,1.272,1.273 configure.in,1.281,1.282

[Martin v. L?wis]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv13970

Modified Files:
	configure configure.in 
Log Message:
Remove INET6 define. Use ENABLE_IPV6 instead.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.272
retrieving revision 1.273
diff -C2 -d -r1.272 -r1.273
*** configure	2001/11/14 10:59:57	1.272
--- configure	2001/12/02 10:15:36	1.273
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.280 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.281 
  
[...2354 lines suppressed...]
  if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7470 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 7522,7526 ****
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7525: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
--- 7516,7520 ----
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7519: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.281
retrieving revision 1.282
diff -C2 -d -r1.281 -r1.282
*** configure.in	2001/11/14 10:59:57	1.281
--- configure.in	2001/12/02 10:15:37	1.282
***************
*** 1190,1195 ****
  yes
  #endif],
! 				[ipv6type=$i;
! 				OPT="-DINET6 $OPT"])
  			;;
  		kame)
--- 1190,1194 ----
  yes
  #endif],
! 				[ipv6type=$i])
  			;;
  		kame)
***************
*** 1203,1208 ****
  				ipv6lib=inet6
  				ipv6libdir=/usr/local/v6/lib
! 				ipv6trylibc=yes
! 				OPT="-DINET6 $OPT"])
  			;;
  		linux-glibc)
--- 1202,1206 ----
  				ipv6lib=inet6
  				ipv6libdir=/usr/local/v6/lib
! 				ipv6trylibc=yes])
  			;;
  		linux-glibc)
***************
*** 1214,1219 ****
  #endif],
  				[ipv6type=$i;
! 				ipv6trylibc=yes
! 				OPT="-DINET6 $OPT"])
  			;;
  		linux-inet6)
--- 1212,1216 ----
  #endif],
  				[ipv6type=$i;
! 				ipv6trylibc=yes])
  			;;
  		linux-inet6)
***************
*** 1223,1227 ****
  				ipv6lib=inet6
  				ipv6libdir=/usr/inet6/lib
! 				OPT="-DINET6 -I/usr/inet6/include $OPT"
  			fi
  			;;
--- 1220,1224 ----
  				ipv6lib=inet6
  				ipv6libdir=/usr/inet6/lib
! 				OPT="-I/usr/inet6/include $OPT"
  			fi
  			;;
***************
*** 1231,1235 ****
  				ipv6type=$i
  				ipv6trylibc=yes
- 				OPT="-DINET6 $OPT"
                            fi
                          fi
--- 1228,1231 ----
***************
*** 1243,1248 ****
  				[ipv6type=$i;
  				ipv6lib=inet6;
! 				ipv6libdir=/usr/local/v6/lib;
! 				OPT="-DINET6 $OPT"])
  			;;
  		v6d)
--- 1239,1243 ----
  				[ipv6type=$i;
  				ipv6lib=inet6;
! 				ipv6libdir=/usr/local/v6/lib])
  			;;
  		v6d)
***************
*** 1265,1270 ****
  				[ipv6type=$i;
  				ipv6lib=inet6;
! 				ipv6libdir=/usr/local/v6/lib;
! 				OPT="-DINET6 $OPT"])
  			;;
  		esac
--- 1260,1264 ----
  				[ipv6type=$i;
  				ipv6lib=inet6;
! 				ipv6libdir=/usr/local/v6/lib])
  			;;
  		esac