[Python-checkins] CVS: python/dist/src configure,1.246,1.246.2.1 configure.in,1.254,1.254.2.1

Barry Warsaw bwarsaw@users.sourceforge.net
Fri, 07 Sep 2001 07:52:09 -0700


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

Modified Files:
      Tag: r22a3-branch
	configure configure.in 
Log Message:
Merging Jack's trunk change for Mac OSX 10.1...

    (Slightly modified) patch by Steve Spicklemire to make Python build
    out of the box on OSX 10.1. Untested by me (except for not having adverse
    effects on 10.0.4) but it looks good, for now. Eventually we should not
    trigger on the darwin version but test for something, but until I have
    the time to install 10.1 myself I have no clue what to test on.

    It would be nice if this got in to the 2.2a3 distribution.



Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.246
retrieving revision 1.246.2.1
diff -C2 -d -r1.246 -r1.246.2.1
*** configure	2001/09/05 19:13:16	1.246
--- configure	2001/09/07 14:52:06	1.246.2.1
***************
*** 2948,2951 ****
--- 2948,2957 ----
  
  case $ac_sys_system/$ac_sys_release in
+   Darwin/1.4*)
+     ns_undef_sym='_environ'
+     LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
+       LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
    Darwin/*)
[...3026 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 7122 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 7150,7154 ****
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7153: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
--- 7168,7172 ----
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7171: 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.254
retrieving revision 1.254.2.1
diff -C2 -d -r1.254 -r1.254.2.1
*** configure.in	2001/09/05 19:11:49	1.254
--- configure.in	2001/09/07 14:52:06	1.254.2.1
***************
*** 583,586 ****
--- 583,592 ----
  AC_SUBST(LIBTOOL_CRUFT)
  case $ac_sys_system/$ac_sys_release in
+   Darwin/1.4*)
+     ns_undef_sym='_environ'
+     LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc -flat_namespace -U $ns_undef_sym"
+       LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
    Darwin/*)
      ns_undef_sym='_environ'
***************
*** 600,604 ****
  	# in the build location.
  	
! 	LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym"
  	AC_DEFINE(WITH_NEXT_FRAMEWORK)
  	AC_MSG_RESULT(yes)
--- 606,613 ----
  	# in the build location.
  	
! 	case $ac_sys_system/$ac_sys_release in
! 	    Darwin/1.4*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-flat_namespace,-U,$ns_undef_sym";;
! 	    Darwin/*)LDFLAGS="$LDFLAGS -Wl,-F. -Wl,-U,$ns_undef_sym";;
! 	esac
  	AC_DEFINE(WITH_NEXT_FRAMEWORK)
  	AC_MSG_RESULT(yes)
***************
*** 663,666 ****
--- 672,684 ----
  	OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
  	DYNIX/ptx*) LDSHARED="ld -G";;
+ 	Darwin/1.4*)
+ 		LDSHARED='$(CC) $(LDFLAGS) -bundle'
+ 		if test "$enable_framework" ; then
+ 			# Link against the framework. All externals should be defined.
+ 			LDSHARED="$LDSHARED "'-framework $(PYTHONFRAMEWORK)'
+ 		else
+ 			# No framework. Ignore undefined symbols, assuming they come from Python
+ 			LDSHARED="$LDSHARED -flat_namespace -undefined suppress"
+ 		fi ;;
  	Darwin/*)
  		LDSHARED='$(CC) $(LDFLAGS) -bundle'