[Python-checkins] CVS: python/dist/src configure.in,1.215.2.6,1.215.2.7 configure,1.207.2.6,1.207.2.7

[Jack Jansen]

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

Modified Files:
      Tag: release21-maint
	configure.in configure 
Log Message:
A slightly different version of patch 489388 which addresses two MacOSX issues:
- Use -flat-namespace linker option to allow building on 10.1 and later.
- Allows it to build on 10.1.1 and later (which use a different version
  numbering scheme for "uname").

Anthony asked me to check this in.


Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.215.2.6
retrieving revision 1.215.2.7
diff -C2 -d -r1.215.2.6 -r1.215.2.7
*** configure.in	2001/12/23 04:07:25	1.215.2.6
--- configure.in	2001/12/27 21:55:46	1.215.2.7
***************
*** 325,328 ****
--- 325,332 ----
  	esac
      esac
+     case $ac_sys_system in
+     Darwin*)
+     	OPT="$OPT -no-cpp-precomp";;
+     esac
  fi
  
***************
*** 505,511 ****
  AC_SUBST(LIBTOOL_CRUFT)
  case $ac_sys_system/$ac_sys_release in
!   Darwin/*)
      ns_undef_sym='_environ'
      LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym" ;;
    next/4*)
      ns_undef_sym='__environ'
--- 509,518 ----
  AC_SUBST(LIBTOOL_CRUFT)
  case $ac_sys_system/$ac_sys_release in
!   Darwin/1.3*)
      ns_undef_sym='_environ'
      LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -U $ns_undef_sym" ;;
+   Darwin/*)
+     ns_undef_sym='_environ'
+     LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym" ;;
    next/4*)
      ns_undef_sym='__environ'
***************
*** 522,526 ****
  	# -U __environ is needed since bundles don't have access
  	# to crt0 when built but will always be linked against it
! 	LDFLAGS="$LDFLAGS -Wl,-U,$ns_undef_sym"
  	AC_DEFINE(WITH_NEXT_FRAMEWORK)
  	AC_MSG_RESULT(yes)
--- 529,536 ----
  	# -U __environ is needed since bundles don't have access
  	# to crt0 when built but will always be linked against it
! 	case $ac_sys_system/$ac_sys_release in
! 	    Darwin/1.3*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym";;
! 	    Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
! 	esac
  	AC_DEFINE(WITH_NEXT_FRAMEWORK)
  	AC_MSG_RESULT(yes)
***************
*** 589,598 ****
  	OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
  	DYNIX/ptx*) LDSHARED="ld -G";;
!         Darwin/*|next/*) 
  		if test "$ns_dyld"
  		then LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined suppress'
  		else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';
  		fi
! 	if test "$with_next_framework" ; then
  		    LDSHARED="$LDSHARED \$(LDLIBRARY)"
  		fi ;;
--- 599,613 ----
  	OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
  	DYNIX/ptx*) LDSHARED="ld -G";;
!         Darwin/1.3*|next/*) 
  		if test "$ns_dyld"
  		then LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined suppress'
  		else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';
  		fi
! 		if test "$with_next_framework" ; then
! 		    LDSHARED="$LDSHARED \$(LDLIBRARY)"
! 		fi ;;
!         Darwin/*) 
! 		LDSHARED='$(CC) $(LDFLAGS) -flat_namespace -bundle -undefined suppress'
! 		if test "$with_next_framework" ; then
  		    LDSHARED="$LDSHARED \$(LDLIBRARY)"
  		fi ;;

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.207.2.6
retrieving revision 1.207.2.7
diff -C2 -d -r1.207.2.6 -r1.207.2.7
*** configure	2001/12/23 04:07:22	1.207.2.6
--- configure	2001/12/27 21:55:46	1.207.2.7
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.215.2.5 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.215.2.6 
  
[...3905 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 6338 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6369,6373 ****
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6372: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
--- 6384,6388 ----
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6387: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then