[Python-checkins] CVS: python/dist/src configure.in,1.168,1.169 configure,1.159,1.160
Fred L. Drake
python-dev@python.org
Mon, 9 Oct 2000 10:06:17 -0700
Update of /cvsroot/python/python/dist/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv16929
Modified Files:
configure.in configure
Log Message:
Donn Cave <donn@oz.net>:
Update for BeOS.
This closes SourceForge patch #101774.
Also fix typo in a comment.
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -r1.168 -r1.169
*** configure.in 2000/10/07 16:21:27 1.168
--- configure.in 2000/10/09 17:06:13 1.169
***************
*** 118,134 ****
without_gcc=;;
BeOS*)
- # Dunno if it's a good idea to get this over with all at once, or
- # to handle it in with the other goodies.
- MACHDEP=beos
-
case $BE_HOST_CPU in
ppc)
! CC="mwcc -I$PWD/BeOS -nodup"
without_gcc=yes
! case `uname -r` in
! 4.0*) OPT="-DUSE_DL_EXPORT -O7 -opt schedule604 -export pragma" ;;
! *) OPT="-DUSE_DL_EXPORT -O2 -proc 604e -export pragma" ;;
! esac
! CCSHARED=-UUSE_DL_EXPORT
LDFLAGS="$LDFLAGS -nodup"
--- 118,127 ----
without_gcc=;;
BeOS*)
case $BE_HOST_CPU in
ppc)
! CC=mwcc
without_gcc=yes
! OPT="-O -D'DL_EXPORT(RTYPE)=__declspec(dllexport) RTYPE' -D'DL_IMPORT(RTYPE)=__declspec(dllexport) RTYPE' -export pragma"
! CCSHARED="UDL_IMPORT -D'DL_IMPORT(RTYPE)=__declspec(dllimport) RTYPE'"
LDFLAGS="$LDFLAGS -nodup"
***************
*** 139,154 ****
;;
x86)
! CC="gcc -I$PWD/BeOS"
without_gcc=no
! OPT="-DUSE_DL_EXPORT -O"
! CCSHARED=-UUSE_DL_EXPORT
!
AR="$PWD/BeOS/ar-fake"
RANLIB=:
-
- AC_DEFINE(DL_EXPORT_HEADER,"dl_export.h")
;;
*)
! AC_ERROR(Your BeOS system isn't PowerPC or x86... neat, but this won't work...)
;;
esac
--- 132,144 ----
;;
x86)
! CC=gcc
without_gcc=no
! OPT=-O
! # Really should use srcdir instead of PWD
AR="$PWD/BeOS/ar-fake"
RANLIB=:
;;
*)
! AC_ERROR(Unknown BeOS platform \"$BE_HOST_CPU\")
;;
esac
***************
*** 221,228 ****
cc|*/cc) CC="$CC -Ae";;
esac;;
- BeOS*)
- case $CC in
- cc) CC=cc;;
- esac;;
Monterey*)
case $CC in
--- 211,214 ----
***************
*** 240,244 ****
# LINKCC is the command that links the python executable -- default is $(CC).
! # This is altered for AIX and BeOS in order to build the export list before
# linking.
AC_SUBST(LINKCC)
--- 226,230 ----
# LINKCC is the command that links the python executable -- default is $(CC).
! # This is altered for AIX in order to build the export list before
# linking.
AC_SUBST(LINKCC)
***************
*** 253,259 ****
AIX*)
LINKCC="\$(srcdir)/makexp_aix python.exp \"\" \$(LIBRARY); \$(PURIFY) \$(CC)";;
- BeOS*)
- LINKCC="\$(srcdir)/../BeOS/linkcc \$(LIBRARY) \$(PURIFY) \$(CC) \$(OPT)"
- LDLIBRARY='libpython$(VERSION).so';;
dgux*)
LINKCC="LD_RUN_PATH=$libdir \$(PURIFY) \$(CC)";;
--- 239,242 ----
***************
*** 275,283 ****
# DG/UX requires some fancy ld contortions to produce a .so from an .a
! if test "$MACHDEP" = "dguxR4"
! then
! LDLIBRARY='libpython$(VERSION).so'
! OPT="$OPT -pic"
! fi
AC_MSG_RESULT($LDLIBRARY)
--- 258,270 ----
# DG/UX requires some fancy ld contortions to produce a .so from an .a
! case $MACHDEP in
! dguxR4)
! LDLIBRARY='libpython$(VERSION).so'
! OPT="$OPT -pic"
! ;;
! beos*)
! LDLIBRARY='libpython$(VERSION).so'
! ;;
! esac
AC_MSG_RESULT($LDLIBRARY)
***************
*** 842,846 ****
fi
else
! # make sure user knows why bsddb support wasn't enabled event
# though s/he requested it
if test "$with_libdb" = "yes"
--- 829,833 ----
fi
else
! # make sure user knows why bsddb support wasn't enabled even
# though s/he requested it
if test "$with_libdb" = "yes"
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -r1.159 -r1.160
*** configure 2000/10/07 16:21:27 1.159
--- configure 2000/10/09 17:06:13 1.160
***************
*** 4,8 ****
# Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.13
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
--- 4,8 ----
# Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.14.1
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
[...4700 lines suppressed...]
! echo "$CONFIG_STATUS generated by autoconf version 2.13"
exit 0 ;;
-help | --help | --hel | --he | --h)
--- 6022,6026 ----
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
! echo "$CONFIG_STATUS generated by autoconf version 2.14.1"
exit 0 ;;
-help | --help | --hel | --he | --h)
***************
*** 6316,6319 ****
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
! test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
--- 6326,6329 ----
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
! test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1