[Python-checkins] CVS: python/dist/src configure,1.250,1.251 configure.in,1.258,1.259 Makefile.pre.in,1.56,1.57

2001年9月11日 07:41:56 -0700

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv32553
Modified Files:
	configure configure.in Makefile.pre.in 
Log Message:
When frameworks are not enabled don't put an empty target in the Makefile.
Older make's can apparently choke on this.
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.250
retrieving revision 1.251
diff -C2 -d -r1.250 -r1.251
*** configure	2001年09月10日 15:34:41	1.250
--- configure	2001年09月11日 14:41:54	1.251
***************
*** 1,5 ****
 #! /bin/sh
 
! # From configure.in Revision: 1.257 
 
 # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
 #! /bin/sh
 
! # From configure.in Revision: 1.258 
 
[...4753 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 7134 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
***************
*** 7173,7177 ****
 SRCDIRS="Parser Grammar Objects Python Modules"
 echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7176: checking for build directories" >&5
 for dir in $SRCDIRS; do
 if test ! -d $dir; then
--- 7180,7184 ----
 SRCDIRS="Parser Grammar Objects Python Modules"
 echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:7183: 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.258
retrieving revision 1.259
diff -C2 -d -r1.258 -r1.259
*** configure.in	2001年09月10日 15:34:42	1.258
--- configure.in	2001年09月11日 14:41:54	1.259
***************
*** 16,34 ****
 AC_ARG_ENABLE(framework,
 [ --enable-framework[=INSTALLDIR] Build (MacOSX|Darwin) framework],[
- 	PYTHONFRAMEWORK=Python
- 	PYTHONFRAMEWORKDIR=Python.framework
 	case $enableval in
 	yes) 
 		enableval=/Library/Frameworks
! 		PYTHONFRAMEWORKPREFIX=$enableval
 		;;
 	*)
 		PYTHONFRAMEWORKPREFIX=$enableval
 	esac
- 	PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
- 	prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
 	],[
 	PYTHONFRAMEWORK=
! 	PYTHONFRAMEWORKDIR=
 	PYTHONFRAMEWORKPREFIX=
 	PYTHONFRAMEWORKINSTALLDIR=
--- 16,41 ----
 AC_ARG_ENABLE(framework,
 [ --enable-framework[=INSTALLDIR] Build (MacOSX|Darwin) framework],[
 	case $enableval in
 	yes) 
 		enableval=/Library/Frameworks
! 	esac
! 	case $enableval in
! 	no)
! 		PYTHONFRAMEWORK=
! 		PYTHONFRAMEWORKDIR=no-framework
! 		PYTHONFRAMEWORKPREFIX=
! 		PYTHONFRAMEWORKINSTALLDIR=
! 		enable_framework=
 		;;
 	*)
+ 		PYTHONFRAMEWORK=Python
+ 		PYTHONFRAMEWORKDIR=Python.framework
 		PYTHONFRAMEWORKPREFIX=$enableval
+ 		PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
+ 		prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
 	esac
 	],[
 	PYTHONFRAMEWORK=
! 	PYTHONFRAMEWORKDIR=no-framework
 	PYTHONFRAMEWORKPREFIX=
 	PYTHONFRAMEWORKINSTALLDIR=
Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** Makefile.pre.in	2001年08月29日 23:44:21	1.56
--- Makefile.pre.in	2001年09月11日 14:41:54	1.57
***************
*** 676,680 ****
 	done
 	@if test -d $(LDLIBRARY); then :; else \
! 		if test -z "$(PYTHONFRAMEWORKDIR)"; then \
 			$(INSTALL_DATA) $(LDLIBRARY) $(LIBPL)/$(LDLIBRARY) ; \
 			$(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \
--- 676,680 ----
 	done
 	@if test -d $(LDLIBRARY); then :; else \
! 		if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
 			$(INSTALL_DATA) $(LDLIBRARY) $(LIBPL)/$(LDLIBRARY) ; \
 			$(RANLIB) $(LIBPL)/$(LDLIBRARY) ; \
***************
*** 737,743 ****
 $(RESSRCDIR)/version.plist \
 $(RESSRCDIR)/English.lproj/InfoPlist.strings
! 	@if test -z "$(PYTHONFRAMEWORKDIR)"; then \
 		echo Not configured with --enable-framework; \
! 		exit; \
 	else true; \
 	fi
--- 737,743 ----
 $(RESSRCDIR)/version.plist \
 $(RESSRCDIR)/English.lproj/InfoPlist.strings
! 	@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
 		echo Not configured with --enable-framework; \
! 		exit 1; \
 	else true; \
 	fi
***************
*** 761,767 ****
 FRAMEWORKFINALDEST=$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)
 frameworkinfrastructureinstall:	$(LDLIBRARY)
! 	@if test -z "$(PYTHONFRAMEWORKDIR)"; then \
 		echo Not configured with --enable-framework; \
! 		exit; \
 	else true; \
 	fi
--- 761,767 ----
 FRAMEWORKFINALDEST=$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)
 frameworkinfrastructureinstall:	$(LDLIBRARY)
! 	@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
 		echo Not configured with --enable-framework; \
! 		exit 1; \
 	else true; \
 	fi