[Python-checkins] CVS: python/dist/src configure.in,1.195,1.196

[Neil Schemenauer]

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

Modified Files:
	configure.in 
Log Message:
- LIBRARY is now a SUBST variable.
- Add CFLAGSFORSHARED variable.  configure sets this to CCSHARED if LDLIBRARY
  is a shared library.
- Remove -fPIC from OPT, it has no business there.
- Change CCSHARED option for Linux to -fPIC.  It should probably be
  -fPIC on a few other platforms as well.
- Don't create silly boot Makefile, create Setup files and run makesetup
  instead.


Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.195
retrieving revision 1.196
diff -C2 -r1.195 -r1.196
*** configure.in	2001/01/24 17:24:33	1.195
--- configure.in	2001/01/26 16:18:16	1.196
***************
*** 191,194 ****
--- 191,202 ----
  esac
  
+ AC_SUBST(LIBRARY)
+ AC_MSG_CHECKING(LIBRARY)
+ if test -z "$LIBRARY"
+ then
+ 	LIBRARY='libpython$(VERSION).a'
+ fi
+ AC_MSG_RESULT($LIBRARY)
+ 
  # LDLIBRARY is the name of the library to link against (as opposed to the
  # name of the library into which to insert object files). On systems
***************
*** 198,202 ****
  AC_SUBST(LDLIBRARY)
  AC_SUBST(DLLLIBRARY)
! LDLIBRARY='$(LIBRARY)'
  DLLLIBRARY=''
  
--- 206,210 ----
  AC_SUBST(LDLIBRARY)
  AC_SUBST(DLLLIBRARY)
! LDLIBRARY="$LIBRARY"
  DLLLIBRARY=''
  
***************
*** 271,276 ****
  	yes)
  		case $ac_cv_prog_cc_g in
! 		yes)	OPT="-g -O2 -Wall -Wstrict-prototypes -fPIC";;
! 		*)	OPT="-O2 -Wall -Wstrict-prototypes -fPIC";;
  		esac
  		;;
--- 279,284 ----
  	yes)
  		case $ac_cv_prog_cc_g in
! 		yes)	OPT="-g -O2 -Wall -Wstrict-prototypes";;
! 		*)	OPT="-O2 -Wall -Wstrict-prototypes";;
  		esac
  		;;
***************
*** 284,292 ****
  esac
  
- # Cygwin does not need PIC compiler option so remove it to prevent warnings
- case $ac_sys_system in
- CYGWIN*) OPT="`echo $OPT | sed 's/ *-fPIC//'`";;
- esac
- 
  if test "$ac_arch_flags"
  then
--- 292,295 ----
***************
*** 582,586 ****
  		 else CCSHARED="+z";
  		 fi;;
! 	Linux*) CCSHARED="-fpic";;
  	BSD/OS*/4*) CCSHARED="-fpic";;
  	OpenBSD*) CCSHARED="-fpic";;
--- 585,589 ----
  		 else CCSHARED="+z";
  		 fi;;
! 	Linux*) CCSHARED="-fPIC";;
  	BSD/OS*/4*) CCSHARED="-fpic";;
  	OpenBSD*) CCSHARED="-fpic";;
***************
*** 633,636 ****
--- 636,647 ----
  AC_MSG_RESULT($LINKFORSHARED)
  
+ AC_SUBST(CFLAGSFORSHARED)
+ AC_MSG_CHECKING(CFLAGSFORSHARED)
+ if test ! "$LIBRARY" = "$LDLIBRARY"
+ then
+ 	CFLAGSFORSHARED='$(CCSHARED)'
+ fi
+ AC_MSG_RESULT($CFLAGSFORSHARED)
+ 
  # checks for libraries
  AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
***************
*** 1396,1407 ****
  
  # generate output files
! echo "creating Makefile"
  
! # "boot" Makefile
! cat >Makefile <<\EOF
! # This file is automaticly generated by configure.
! all:
! 	\$(MAKE) -f Makefile.pre Makefile
! EOF
  
! AC_OUTPUT(Makefile.pre Modules/Setup.config setup.cfg)
--- 1407,1426 ----
  
  # generate output files
! AC_OUTPUT(Makefile.pre Modules/Setup.config setup.cfg)
  
! echo "creating Setup"
! if test ! -f Modules/Setup
! then
! 	cp $srcdir/Modules/Setup.dist Modules/Setup
! fi
  
! echo "creating Setup.local"
! if test ! -f Modules/Setup.local
! then
! 	echo "# Edit this file for local setup changes" >Modules/Setup.local
! fi
! 
! echo "creating Makefile"
! $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \
! 			-s Modules Modules/Setup.config \
! 			Modules/Setup Modules/Setup.local