[Python-checkins] CVS: python/dist/src configure.in,1.239,1.240 configure,1.230,1.231

[Jack Jansen]

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

Modified Files:
	configure.in configure 
Log Message:
Various fixes to streamline build process on Mac OS X:
- Give a warning if you're on a case-insensitive filesystem and have
  not specified --with-suffix.
- Don't require --with-dyld, it is now default for OSX/Darwin (suggested
  by Martin v. Loewis)
- Don't define _POSIX_THREADS on Darwin, it's done by standard headers already
  (fix by Tony Lownds)
- Don't use the Mac subtree anymore, the routines relevant to OSX/Darwin
  have moved to a new file Python/mactoolboxglue.c.



Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.239
retrieving revision 1.240
diff -C2 -d -r1.239 -r1.240
*** configure.in	2001/08/08 10:39:03	1.239
--- configure.in	2001/08/08 13:56:14	1.240
***************
*** 45,49 ****
  [  --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
--- 45,49 ----
  [  --with-next-framework           Build (OpenStep|Rhapsody|MacOSX|Darwin) framework],,)
  AC_ARG_WITH(dyld,
! [  --with-dyld                     Use (OpenStep|Rhapsody) dynamic linker],,)
  
  # Set name for machine-dependent library files
***************
*** 181,184 ****
--- 181,190 ----
  	esac])
  AC_MSG_RESULT($EXEEXT)
+ # Test whether we're running on a non-case-sensitive system, in which
+ # case we give a warning if no ext is given
+ if test -d "python" -a -z "$EXEEXT"
+ then
+     AC_MSG_WARN(This filesystem is not case-sensitive so you should probably use --with-suffix)
+ fi
  
  case $MACHDEP in
***************
*** 704,720 ****
  
  AC_MSG_CHECKING(for --with-dyld)
! if test "$with_next_framework" -o "$with_dyld"
! then
! 	if test "$with_dyld"
  	then
! 		AC_MSG_RESULT(yes)
  	else
! 		AC_MSG_RESULT(required for framework build)
! 	fi
! 	AC_DEFINE(WITH_DYLD)
! 	ns_dyld='set'
! else
! 	AC_MSG_RESULT(no)
! fi
  
  # Set info about shared libraries.
--- 710,733 ----
  
  AC_MSG_CHECKING(for --with-dyld)
! case $ac_sys_system/$ac_sys_release in
!   Darwin/*)
!   	AC_DEFINE(WITH_DYLD)
!   	AC_MSG_RESULT(always on for Darwin)
!   	;;
!   *)
! 	if test "$with_next_framework" -o "$with_dyld"
  	then
! 		if test "$with_dyld"
! 		then
! 			AC_MSG_RESULT(yes)
! 		else
! 			AC_MSG_RESULT(required for framework build)
! 		fi
! 		AC_DEFINE(WITH_DYLD)
! 		ns_dyld='set'
  	else
! 		AC_MSG_RESULT(no)
! 	fi ;;
! esac
  
  # Set info about shared libraries.
***************
*** 763,767 ****
  	OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
  	DYNIX/ptx*) LDSHARED="ld -G";;
!         Darwin/*|next/*) 
  		if test "$ns_dyld"
  		then LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined suppress'
--- 776,785 ----
  	OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
  	DYNIX/ptx*) LDSHARED="ld -G";;
!         Darwin/*) 
! 		LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined suppress'
! 		if test "$with_next_framework" ; then
! 		    LDSHARED="$LDSHARED \$(LDLIBRARY)"
! 		fi ;;
!         next/*) 
  		if test "$ns_dyld"
  		then LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined suppress'
***************
*** 1004,1008 ****
      AC_MSG_RESULT(no)
      AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
!     AC_DEFINE(_POSIX_THREADS)
      LIBS="-lpthread $LIBS"
      LIBOBJS="$LIBOBJS thread.o"],[
--- 1022,1029 ----
      AC_MSG_RESULT(no)
      AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
!     case $ac_sys_system in
!       Darwin*) ;;
!       *) AC_DEFINE(_POSIX_THREADS);;
!     esac
      LIBS="-lpthread $LIBS"
      LIBOBJS="$LIBOBJS thread.o"],[
***************
*** 1167,1171 ****
  	case $ac_sys_system/$ac_sys_release in
  	Darwin/*)
! 		MACHDEP_OBJS="Mac/Python/macglue.o"
  		AC_DEFINE(USE_TOOLBOX_OBJECT_GLUE)
  		;;
--- 1188,1192 ----
  	case $ac_sys_system/$ac_sys_release in
  	Darwin/*)
! 		MACHDEP_OBJS="Python/mactoolboxglue.o"
  		AC_DEFINE(USE_TOOLBOX_OBJECT_GLUE)
  		;;

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.230
retrieving revision 1.231
diff -C2 -d -r1.230 -r1.231
*** configure	2001/08/04 22:32:02	1.230
--- configure	2001/08/08 13:56:14	1.231
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.237 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.239 
  
[...4401 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 6981 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 7003,7007 ****
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7006: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
--- 7027,7031 ----
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7030: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then