[Python-checkins] CVS: python/dist/src configure,1.156,1.157 configure.in,1.165,1.166

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv15671

Modified Files:
	configure configure.in 
Log Message:
[ Patch #101730 ] Add initial static support for Darwin/MacOSX.
By D.K. Wolfe.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -r1.156 -r1.157
*** configure	2000/09/26 16:57:37	1.156
--- configure	2000/10/05 18:00:05	1.157
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.165 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.166 
  
[...4025 lines suppressed...]
  echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:5885: checking for socklen_t" >&5
  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 5890 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5888,5897 ----
  EOF
  echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
! echo "configure:5891: checking for socklen_t" >&5
  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 5896 "configure"
  #include "confdefs.h"
  #include <sys/types.h>

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.165
retrieving revision 1.166
diff -C2 -r1.165 -r1.166
*** configure.in	2000/09/25 15:08:45	1.165
--- configure.in	2000/10/05 18:00:06	1.166
***************
*** 9,13 ****
  VERSION=2.0
  
! # NEXTSTEP stuff
  if test -f /usr/lib/NextStep/software_version -o -f /System/Library/CoreServices/software_version ; then
  
--- 9,13 ----
  VERSION=2.0
  
! # NEXTSTEP|MacOSX|Darwin stuff
  if test -f /usr/lib/NextStep/software_version -o -f /System/Library/CoreServices/software_version ; then
  
***************
*** 25,40 ****
  	if test -z "$MACHDEP"
  	then
  		set X `hostinfo | egrep '(NeXT Mach|Kernel Release).*:' | \
!  			sed -e 's/://' -e 's/\./_/'` && \
! 			ac_sys_system=next && ac_sys_release=$4
  
! 		MACHDEP="$ac_sys_system$ac_sys_release"
  	fi
  fi
  
  AC_ARG_WITH(next-framework,
! [  --with-next-framework           Build (OpenStep|Rhapsody|MacOSX) framework],,)
  AC_ARG_WITH(dyld,
! [  --with-dyld                     Use (OpenStep|Rhapsody|MacOSX) dynamic linker],,)
  
  # Set name for machine-dependent library files
--- 25,45 ----
  	if test -z "$MACHDEP"
  	then
+ 	    ac_sys_system=`uname -s`
+ 	    if test "$ac_sys_system" = "Darwin" ; then
+ 		ac_sys_release=`uname -r`
+ 	    else
  		set X `hostinfo | egrep '(NeXT Mach|Kernel Release).*:' | \
! 			sed -e 's/://' -e 's/\./_/'` && \
! 		ac_sys_system=next && ac_sys_release=$4
! 	    fi
  
! 	    MACHDEP="$ac_sys_system$ac_sys_release"
  	fi
  fi
  
  AC_ARG_WITH(next-framework,
! [  --with-next-framework           Build (OpenStep|Rhapsody|MacOSX|Darwin) framework],,)
  AC_ARG_WITH(dyld,
! [  --with-dyld                     Use (OpenStep|Rhapsody|MacOSX|Darwin) dynamic linker],,)
  
  # Set name for machine-dependent library files
***************
*** 575,584 ****
  	OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
  	DYNIX/ptx*) LDSHARED="ld -G";;
! 	next/*) 
  		if test "$ns_dyld"
  		then LDSHARED='$(CC) $(LDFLAGS) -bundle -prebind'
  		else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';
  		fi
!                 if test "$with_next_framework" ; then
  		    LDSHARED="$LDSHARED \$(LDLIBRARY)"
  		fi ;;
--- 580,589 ----
  	OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
  	DYNIX/ptx*) LDSHARED="ld -G";;
!         Darwin/*|next/*) 
  		if test "$ns_dyld"
  		then LDSHARED='$(CC) $(LDFLAGS) -bundle -prebind'
  		else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';
  		fi
! 	if test "$with_next_framework" ; then
  		    LDSHARED="$LDSHARED \$(LDLIBRARY)"
  		fi ;;
***************
*** 1151,1154 ****
--- 1156,1160 ----
  AC_SUBST(LIBM)
  case $ac_sys_system in
+ Darwin) ;;
  next) ;;
  BeOS) ;;