From 67b2659046b624dcd84c09a3912caf33eeb53733 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Sat, 20 Oct 2001 14:21:45 +0000
Subject: [PATCH] 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)
---
 Makefile.pre.in | 4 ++--
 Misc/ACKS       | 1 +
 configure       | 2 +-
 configure.in    | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 5cb7b31ac19..bf319967ef2 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -300,8 +300,8 @@ platform: $(PYTHON)
 # Build the shared modules
 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;; \
+	*-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
 
 # buildno should really depend on something like LIBRARY_SRC
diff --git a/Misc/ACKS b/Misc/ACKS
index 979a510356e..36e41e04218 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -326,6 +326,7 @@ Christopher J. Phoenix
 Neale Pickett
 Dan Pierson
 François Pinard
+Michael Piotrowski
 John Popplewell
 Amrit Prem
 Paul Prescod
diff --git a/configure b/configure
index 4b71c3bd2a3..3aeb078f0b8 100755
--- a/configure
+++ b/configure
@@ -636,7 +636,7 @@ then
 	ac_md_system=`echo $ac_sys_system |
 			   tr -d '/ ' | tr '[A-Z]' '[a-z]'`
 	ac_md_release=`echo $ac_sys_release |
-			   tr -d '/ ' | sed 's/\..*//'`
+			   tr -d '/ ' | sed 's/^[A-Z]\.//' | sed 's/\..*//'`
 	MACHDEP="$ac_md_system$ac_md_release"
 
 	case $MACHDEP in
diff --git a/configure.in b/configure.in
index 96ba400c0a2..9c72c316a71 100644
--- a/configure.in
+++ b/configure.in
@@ -63,7 +63,7 @@ then
 	ac_md_system=`echo $ac_sys_system |
 			   tr -d '[/ ]' | tr '[[A-Z]]' '[[a-z]]'`
 	ac_md_release=`echo $ac_sys_release |
-			   tr -d '[/ ]' | sed 's/\..*//'`
+			   tr -d '[/ ]' | sed 's/^[[A-Z]]\.//' | sed 's/\..*//'`
 	MACHDEP="$ac_md_system$ac_md_release"
 
 	case $MACHDEP in
@@ -1834,7 +1834,7 @@ wchar_h="no"
 # determine wchar_t size
 if test "$wchar_h" = yes
 then
-  AC_CHECK_SIZEOF(wchar_t, 4)
+  AC_CHECK_SIZEOF(wchar_t, 4, [#include <wchar.h>])
 fi
 
 AC_MSG_CHECKING(what type to use for unicode)