[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.64,1.65 configure,1.266,1.267 configure.in,1.274,1.275

[Guido van Rossum]

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

Modified Files:
	Makefile.pre.in configure configure.in 
Log Message:
Patch from SF bug #473150: configure weaknesses on HP-UX (Michael Piotrowski)

    1. configure doesn't handle HP-UX release numbers 
    (e.g., B.11.00), resulting in MACHDEP = "hpuxB". 

    2. After checking for wchar.h, configure doesn't 
    include it when checking the size of wchar_t. 

    (Python 2.2b1 on HP-UX 11.00) 



Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** Makefile.pre.in	2001/10/18 20:34:24	1.64
--- Makefile.pre.in	2001/10/20 14:21:44	1.65
***************
*** 301,306 ****
  sharedmods: $(PYTHON)
  	case $$MAKEFLAGS in \
! 	*-s*) CC='$(CC)' LDSHARED='$(LDSHARED)' ./$(PYTHON) -E $(srcdir)/setup.py -q build;; \
! 	*) CC='$(CC)' LDSHARED='$(LDSHARED)' ./$(PYTHON) -E $(srcdir)/setup.py build;; \
  	esac
  
--- 301,306 ----
  sharedmods: $(PYTHON)
  	case $$MAKEFLAGS in \
! 	*-s*) CC='$(CC)' LDSHARED='$(LDSHARED)' OPT='$(OPT)' ./$(PYTHON) -E $(srcdir)/setup.py -q build;; \
! 	*) CC='$(CC)' LDSHARED='$(LDSHARED)' OPT='$(OPT)' ./$(PYTHON) -E $(srcdir)/setup.py build;; \
  	esac
  

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.266
retrieving revision 1.267
diff -C2 -d -r1.266 -r1.267
*** configure	2001/10/19 01:31:59	1.266
--- configure	2001/10/20 14:21:44	1.267
***************
*** 637,641 ****
  			   tr -d '/ ' | tr '[A-Z]' '[a-z]'`
  	ac_md_release=`echo $ac_sys_release |
! 			   tr -d '/ ' | sed 's/\..*//'`
  	MACHDEP="$ac_md_system$ac_md_release"
  
--- 637,641 ----
  			   tr -d '/ ' | tr '[A-Z]' '[a-z]'`
  	ac_md_release=`echo $ac_sys_release |
! 			   tr -d '/ ' | sed 's/^[A-Z]\.//' | sed 's/\..*//'`
  	MACHDEP="$ac_md_system$ac_md_release"
  

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.274
retrieving revision 1.275
diff -C2 -d -r1.274 -r1.275
*** configure.in	2001/10/19 01:31:59	1.274
--- configure.in	2001/10/20 14:21:44	1.275
***************
*** 64,68 ****
  			   tr -d '[/ ]' | tr '[[A-Z]]' '[[a-z]]'`
  	ac_md_release=`echo $ac_sys_release |
! 			   tr -d '[/ ]' | sed 's/\..*//'`
  	MACHDEP="$ac_md_system$ac_md_release"
  
--- 64,68 ----
  			   tr -d '[/ ]' | tr '[[A-Z]]' '[[a-z]]'`
  	ac_md_release=`echo $ac_sys_release |
! 			   tr -d '[/ ]' | sed 's/^[[A-Z]]\.//' | sed 's/\..*//'`
  	MACHDEP="$ac_md_system$ac_md_release"
  
***************
*** 1835,1839 ****
  if test "$wchar_h" = yes
  then
!   AC_CHECK_SIZEOF(wchar_t, 4)
  fi
  
--- 1835,1839 ----
  if test "$wchar_h" = yes
  then
!   AC_CHECK_SIZEOF(wchar_t, 4, [#include <wchar.h>])
  fi