[Python-checkins] CVS: python/dist/src configure.in,1.241,1.242 configure,1.232,1.233

Martin v. L?wis loewis@users.sourceforge.net
Thu, 09 Aug 2001 04:40:17 -0700


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

Modified Files:
	configure.in configure 
Log Message:
Move IPv6 test further down so that usage of -lnsl has been tested.
Recognize Solaris IPv6 by checking /etc/netconfig.


Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.241
retrieving revision 1.242
diff -C2 -d -r1.241 -r1.242
*** configure.in	2001/08/09 10:29:44	1.241
--- configure.in	2001/08/09 11:40:14	1.242
***************
*** 385,532 ****
  fi
  
- # Check for enable-ipv6
- AC_MSG_CHECKING([whether to enable ipv6])
- AC_ARG_ENABLE(ipv6,
- [  --enable-ipv6                   Enable ipv6 (with ipv4) support
-   --disable-ipv6                  Disable ipv6 support],
- [ case "$enableval" in
-   no)
-        AC_MSG_RESULT(no)
-        ipv6=no
-        ;;
-   *)   AC_MSG_RESULT(yes)
-        AC_DEFINE(ENABLE_IPV6)
-        ipv6=yes
-        ;;
-   esac ],
- 
-   AC_TRY_RUN([ /* AF_INET6 available check */
- #include <sys/types.h>
- #include <sys/socket.h>
- main()
- {
-  if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-    exit(1);
-  else
-    exit(0);
- }
- ],
-   AC_MSG_RESULT(yes)
-   AC_DEFINE(ENABLE_IPV6)
-   ipv6=yes,
-   AC_MSG_RESULT(no)
-   ipv6=no,
-   AC_MSG_RESULT(no)
-   ipv6=no
- ))
- 
- ipv6type=unknown
- ipv6lib=none
- ipv6trylibc=no
- 
- if test "$ipv6" = "yes"; then
- 	AC_MSG_CHECKING([ipv6 stack type])
- 	for i in inria kame linux-glibc linux-inet6 toshiba v6d zeta; do
- 		case $i in
- 		inria)
- 			dnl http://www.kame.net/
- 			AC_EGREP_CPP(yes, [dnl
- #include <netinet/in.h>
- #ifdef IPV6_INRIA_VERSION
- yes
- #endif],
- 				[ipv6type=$i;
- 				OPT="-DINET6 $OPT"])
- 			;;
- 		kame)
- 			dnl http://www.kame.net/
- 			AC_EGREP_CPP(yes, [dnl
- #include <netinet/in.h>
- #ifdef __KAME__
- yes
- #endif],
- 				[ipv6type=$i;
- 				ipv6lib=inet6
- 				ipv6libdir=/usr/local/v6/lib
- 				ipv6trylibc=yes
- 				OPT="-DINET6 $OPT"])
- 			;;
- 		linux-glibc)
- 			dnl http://www.v6.linux.or.jp/
- 			AC_EGREP_CPP(yes, [dnl
- #include <features.h>
- #if defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2))
- yes
- #endif],
- 				[ipv6type=$i;
- 				ipv6trylibc=yes
- 				OPT="-DINET6 $OPT"])
- 			;;
- 		linux-inet6)
- 			dnl http://www.v6.linux.or.jp/
- 			if test -d /usr/inet6; then
- 				ipv6type=$i
- 				ipv6lib=inet6
- 				ipv6libdir=/usr/inet6/lib
- 				OPT="-DINET6 -I/usr/inet6/include $OPT"
- 			fi
- 			;;
- 		toshiba)
- 			AC_EGREP_CPP(yes, [dnl
- #include <sys/param.h>
- #ifdef _TOSHIBA_INET6
- yes
- #endif],
- 				[ipv6type=$i;
- 				ipv6lib=inet6;
- 				ipv6libdir=/usr/local/v6/lib;
- 				OPT="-DINET6 $OPT"])
- 			;;
- 		v6d)
- 			AC_EGREP_CPP(yes, [dnl
- #include </usr/local/v6/include/sys/v6config.h>
- #ifdef __V6D__
- yes
- #endif],
- 				[ipv6type=$i;
- 				ipv6lib=v6;
- 				ipv6libdir=/usr/local/v6/lib;
- 				OPT="-I/usr/local/v6/include $OPT"])
- 			;;
- 		zeta)
- 			AC_EGREP_CPP(yes, [dnl
- #include <sys/param.h>
- #ifdef _ZETA_MINAMI_INET6
- yes
- #endif],
- 				[ipv6type=$i;
- 				ipv6lib=inet6;
- 				ipv6libdir=/usr/local/v6/lib;
- 				OPT="-DINET6 $OPT"])
- 			;;
- 		esac
- 		if test "$ipv6type" != "unknown"; then
- 			break
- 		fi
- 	done
- 	AC_MSG_RESULT($ipv6type)
- fi
- 
- if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
- 	if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
- 		LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
- 		echo "using lib$ipv6lib"
- 	else
- 		if test $ipv6trylibc = "yes"; then
- 			echo "using libc"
- 		else
- 			echo 'Fatal: no $ipv6lib library found.  cannot continue.'
- 			echo "You need to fetch lib$ipv6lib.a from appropriate"
- 			echo 'ipv6 kit and compile beforehand.'
- 			exit 1
- 		fi
- 	fi
- fi
- 
  # -Kpthread, if available, provides the right #defines
  # and linker options to make pthread_create available
--- 385,388 ----
***************
*** 1079,1082 ****
--- 935,1091 ----
          esac
      fi
+ fi
+ 
+ # Check for enable-ipv6
+ AC_MSG_CHECKING([whether to enable ipv6])
+ AC_ARG_ENABLE(ipv6,
+ [  --enable-ipv6                   Enable ipv6 (with ipv4) support
+   --disable-ipv6                  Disable ipv6 support],
+ [ case "$enableval" in
+   no)
+        AC_MSG_RESULT(no)
+        ipv6=no
+        ;;
+   *)   AC_MSG_RESULT(yes)
+        AC_DEFINE(ENABLE_IPV6)
+        ipv6=yes
+        ;;
+   esac ],
+ 
+   AC_TRY_RUN([ /* AF_INET6 available check */
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ main()
+ {
+  if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+    exit(1);
+  else
+    exit(0);
+ }
+ ],
+   AC_MSG_RESULT(yes)
+   AC_DEFINE(ENABLE_IPV6)
+   ipv6=yes,
+   AC_MSG_RESULT(no)
+   ipv6=no,
+   AC_MSG_RESULT(no)
+   ipv6=no
+ ))
+ 
+ ipv6type=unknown
+ ipv6lib=none
+ ipv6trylibc=no
+ 
+ if test "$ipv6" = "yes"; then
+ 	AC_MSG_CHECKING([ipv6 stack type])
+ 	for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta; do
+ 		case $i in
+ 		inria)
+ 			dnl http://www.kame.net/
+ 			AC_EGREP_CPP(yes, [dnl
+ #include <netinet/in.h>
+ #ifdef IPV6_INRIA_VERSION
+ yes
+ #endif],
+ 				[ipv6type=$i;
+ 				OPT="-DINET6 $OPT"])
+ 			;;
+ 		kame)
+ 			dnl http://www.kame.net/
+ 			AC_EGREP_CPP(yes, [dnl
+ #include <netinet/in.h>
+ #ifdef __KAME__
+ yes
+ #endif],
+ 				[ipv6type=$i;
+ 				ipv6lib=inet6
+ 				ipv6libdir=/usr/local/v6/lib
+ 				ipv6trylibc=yes
+ 				OPT="-DINET6 $OPT"])
+ 			;;
+ 		linux-glibc)
+ 			dnl http://www.v6.linux.or.jp/
+ 			AC_EGREP_CPP(yes, [dnl
+ #include <features.h>
+ #if defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2))
+ yes
+ #endif],
+ 				[ipv6type=$i;
+ 				ipv6trylibc=yes
+ 				OPT="-DINET6 $OPT"])
+ 			;;
+ 		linux-inet6)
+ 			dnl http://www.v6.linux.or.jp/
+ 			if test -d /usr/inet6; then
+ 				ipv6type=$i
+ 				ipv6lib=inet6
+ 				ipv6libdir=/usr/inet6/lib
+ 				OPT="-DINET6 -I/usr/inet6/include $OPT"
+ 			fi
+ 			;;
+ 		solaris)
+ 			if test -f /etc/netconfig; then
+                           if /usr/xpg4/bin/grep -q tcp6 /etc/netconfig; then
+ 				ipv6type=$i
+ 				ipv6trylibc=yes
+ 				OPT="-DINET6 $OPT"
+                           fi
+                         fi
+ 			;;
+ 		toshiba)
+ 			AC_EGREP_CPP(yes, [dnl
+ #include <sys/param.h>
+ #ifdef _TOSHIBA_INET6
+ yes
+ #endif],
+ 				[ipv6type=$i;
+ 				ipv6lib=inet6;
+ 				ipv6libdir=/usr/local/v6/lib;
+ 				OPT="-DINET6 $OPT"])
+ 			;;
+ 		v6d)
+ 			AC_EGREP_CPP(yes, [dnl
+ #include </usr/local/v6/include/sys/v6config.h>
+ #ifdef __V6D__
+ yes
+ #endif],
+ 				[ipv6type=$i;
+ 				ipv6lib=v6;
+ 				ipv6libdir=/usr/local/v6/lib;
+ 				OPT="-I/usr/local/v6/include $OPT"])
+ 			;;
+ 		zeta)
+ 			AC_EGREP_CPP(yes, [dnl
+ #include <sys/param.h>
+ #ifdef _ZETA_MINAMI_INET6
+ yes
+ #endif],
+ 				[ipv6type=$i;
+ 				ipv6lib=inet6;
+ 				ipv6libdir=/usr/local/v6/lib;
+ 				OPT="-DINET6 $OPT"])
+ 			;;
+ 		esac
+ 		if test "$ipv6type" != "unknown"; then
+ 			break
+ 		fi
+ 	done
+ 	AC_MSG_RESULT($ipv6type)
+ fi
+ 
+ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
+ 	if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
+ 		LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
+ 		echo "using lib$ipv6lib"
+ 	else
+ 		if test $ipv6trylibc = "yes"; then
+ 			echo "using libc"
+ 		else
+ 			echo 'Fatal: no $ipv6lib library found.  cannot continue.'
+ 			echo "You need to fetch lib$ipv6lib.a from appropriate"
+ 			echo 'ipv6 kit and compile beforehand.'
+ 			exit 1
+ 		fi
+ 	fi
  fi
  

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.232
retrieving revision 1.233
diff -C2 -d -r1.232 -r1.233
*** configure	2001/08/09 10:29:44	1.232
--- configure	2001/08/09 11:40:14	1.233
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.240 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.241 
  
[...4348 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 6999 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 7036,7040 ****
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7039: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
--- 7045,7049 ----
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7048: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then