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)
This commit is contained in:
Guido van Rossum 2001-10-20 14:21:45 +00:00
parent 0aa811c527
commit 67b2659046
4 changed files with 6 additions and 5 deletions

View File

@ -300,8 +300,8 @@ platform: $(PYTHON)
# Build the shared modules # Build the shared modules
sharedmods: $(PYTHON) sharedmods: $(PYTHON)
case $$MAKEFLAGS in \ case $$MAKEFLAGS in \
*-s*) CC='$(CC)' LDSHARED='$(LDSHARED)' ./$(PYTHON) -E $(srcdir)/setup.py -q build;; \ *-s*) CC='$(CC)' LDSHARED='$(LDSHARED)' OPT='$(OPT)' ./$(PYTHON) -E $(srcdir)/setup.py -q build;; \
*) CC='$(CC)' LDSHARED='$(LDSHARED)' ./$(PYTHON) -E $(srcdir)/setup.py build;; \ *) CC='$(CC)' LDSHARED='$(LDSHARED)' OPT='$(OPT)' ./$(PYTHON) -E $(srcdir)/setup.py build;; \
esac esac
# buildno should really depend on something like LIBRARY_SRC # buildno should really depend on something like LIBRARY_SRC

View File

@ -326,6 +326,7 @@ Christopher J. Phoenix
Neale Pickett Neale Pickett
Dan Pierson Dan Pierson
François Pinard François Pinard
Michael Piotrowski
John Popplewell John Popplewell
Amrit Prem Amrit Prem
Paul Prescod Paul Prescod

2
configure vendored
View File

@ -636,7 +636,7 @@ then
ac_md_system=`echo $ac_sys_system | ac_md_system=`echo $ac_sys_system |
tr -d '/ ' | tr '[A-Z]' '[a-z]'` tr -d '/ ' | tr '[A-Z]' '[a-z]'`
ac_md_release=`echo $ac_sys_release | 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" MACHDEP="$ac_md_system$ac_md_release"
case $MACHDEP in case $MACHDEP in

View File

@ -63,7 +63,7 @@ then
ac_md_system=`echo $ac_sys_system | ac_md_system=`echo $ac_sys_system |
tr -d '[/ ]' | tr '[[A-Z]]' '[[a-z]]'` tr -d '[/ ]' | tr '[[A-Z]]' '[[a-z]]'`
ac_md_release=`echo $ac_sys_release | 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" MACHDEP="$ac_md_system$ac_md_release"
case $MACHDEP in case $MACHDEP in
@ -1834,7 +1834,7 @@ wchar_h="no"
# determine wchar_t size # determine wchar_t size
if test "$wchar_h" = yes if test "$wchar_h" = yes
then then
AC_CHECK_SIZEOF(wchar_t, 4) AC_CHECK_SIZEOF(wchar_t, 4, [#include <wchar.h>])
fi fi
AC_MSG_CHECKING(what type to use for unicode) AC_MSG_CHECKING(what type to use for unicode)