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)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 5cb7b31ac19f2053ae086c296070774a2ea08e5a..bf319967ef25713bfe3e07fa1eaccc1625965456 100644 (file)
--- 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 979a510356e3d9bca92d11a887d33c476c9d6e1b..36e41e0421892e97d4ea5c328f84c1836ef72e0e 100644 (file)
--- 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 4b71c3bd2a30654e7bd254c63fcea27610b1169b..3aeb078f0b8f15eacd1a1cde3d96d106031b6071 100755 (executable)
--- 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 96ba400c0a21c8cbed72f6e13850792670e0f9de..9c72c316a715b6fb77c176bc912506f8b8c42305 100644 (file)
--- 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)