[Python-checkins] CVS: python/dist/src/Modules Setup.guido,NONE,2.7.2.1 Setup.irix4,NONE,1.1.4.1 Setup.irix5,NONE,2.6.2.1 Setup.minix,NONE,2.3.2.1 Setup.solaris2,NONE,1.1.4.1 Setup.sunos4,NONE,1.1.4.1 imgformat.c,NONE,2.1.2.1 version.c,NONE,2.2.2.1 main.c,1.52.4.1,1.52.4.2 mmapmodule.c,2.28.2.1,2.28.2.2

Tim Peters tim_one@users.sourceforge.net
Mon, 16 Jul 2001 14:46:02 -0700


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

Modified Files:
      Tag: descr-branch
	main.c mmapmodule.c 
Added Files:
      Tag: descr-branch
	Setup.guido Setup.irix4 Setup.irix5 Setup.minix Setup.solaris2 
	Setup.sunos4 imgformat.c version.c 
Log Message:
Resuming interrupted merge checkin.


--- NEW FILE: Setup.guido ---
# Each line in this file describes one or more optional modules.
# Comment out lines to suppress modules.
# Lines have the following structure:
#
# <module> ... [<objectfile> ...] [<cpparg> ...] [<library> ...]
#
# <objectfile> is anything ending in .o
# <cpparg> is anything starting with -I, -D, -U or -C
# <library> is anything ending in .a or beginning with -l or -L
# <module> is anything else but should be a valid Python
# identifier (letters, digits, underscores, beginning with non-digit)
#
# Lines can also have the form
#
# <name> = <value>
#
# which defines a Make variable definition inserted into Makefile.in
#
# NOTE: As a standard policy, as many modules as can be supported by a
# platform should be present.  The distribution comes with all modules
# enabled that are supported by most platforms and don't require you
# to ftp sources from elsewhere.  To make this easier for SGI
# platforms, you can copy Setup.sgi to Setup (or edit Makefile.in.in
# to use Setup.sgi instead of Setup).


# Some special rules to define PYTHONPATH
# Edit the definitions below to indicate which options you are using

# Don't edit this (usually)
DESTLIB=$(prefix)/lib/python

# Standard enabled (tests are always available)
TESTPATH=:$(DESTLIB)/test

# Enable this for SGI systems
ARCHPATH=:$(DESTLIB)/sgi

# Enable this for Sun systems
#ARCHPATH=:$(DESTLIB)/sun4

# Enable this if stdwin installed
STDWINPATH=:$(DESTLIB)/stdwin

PYTHONPATH=.:$(DESTLIB)$(TESTPATH)$(ARCHPATH)$(STDWINPATH)


# Modules that should always be present (non UNIX dependent)

array arraymodule.o	# array objects
math mathmodule.o	# math library functions, e.g. sin()
parser parsermodule.o	# raw interface to the Python parser
posix posixmodule.o	# posix (UNIX) system calls
regex regexmodule.o regexpr.o	# Regular expressions, GNU Emacs style
strop stropmodule.o	# fast string operations implemented in C
struct structmodule.o	# binary structure packing/unpacking
time timemodule.o	# time operations and variables


# Modules with some UNIX dependencies -- on by default.
# Note that some UNIX versions still don't support all of these
# so you may have to comment them out before the build completes.

dbm dbmmodule.o		# dbm(3) may require -ldbm or similar
fcntl fcntlmodule.o	# fcntl(2) and ioctl(2)
nis nismodule.o		# Sun yellow pages -- not everywhere
pwd grp pwdmodule.o	# pwd(3) and grp(3)
crypt cryptmodule.o	# crypt(3)
select selectmodule.o	# select(2); not on ancient System V
socket socketmodule.o	# socket(2); not on ancient System V


# Multimedia modules -- on by default
# These represent audio samples or images as strings

audioop audioopmodule.o # Operations on audio samples
imageop imageopmodule.o # Operations on images
rgbimg rgbimgmodule.o   # Read SGI RGB image files (but coded portably)


# The stdwin module provides a simple, portable (between X11 and Mac)
# windowing interface.  You need to ftp the STDWIN library, e.g. from
# ftp://ftp.cwi.nl/pub/stdwin.  The STDWIN variable must point to the
# STDWIN toplevel directory.  The ARCH variable must be set to the
# architecture identifier used to build STDWIN.  NB if you combine this
# with the gl module on an SGI machine, you should replace "-lX11" with
# "-lX11_s".

STDWIN=/ufs/guido/src/stdwin
ARCH=sgi
stdwin stdwinmodule.o -I$(STDWIN)/H $(STDWIN)/Build/$(ARCH)/x11/lib/lib.a -lX11_s


# The md5 module implements the RSA Data Security, Inc. MD5
# Message-Digest Algorithm, described in RFC 1321.  The necessary files
# md5c.c and md5.h are included here.

md5 md5module.o md5c.o


# The mpz module interfaces to the GNU Multiple Precision library.
# You need to ftp the GNU MP library.  This was last tested with a
# somewhat modified (to get around bugs) version of GMP 1.2; it will
# likely need some work for more recent versions.  The GMP variable
# must point to the GMP source directory.

GMP=/ufs/guido/src/gmp
mpz mpzmodule.o -I$(GMP) $(GMP)/libgmp.a


# The rotor module (contributed by Lance Ellinghouse) implements a
# rotor-based encryption algorithm.  It is self-contained.

rotor rotormodule.o


# SGI IRIX specific modules -- off by default.
# Switch this on if you have an SGI machine.
# Note that some required libraries and header files aren't always
# installed; you may be better off switching on only 'fm' and 'gl'
# (Font Manager and Graphics Library).

al almodule.o -laudio		# audio
cd cdmodule.o -lcdaudio -lds	#
cl clmodule.o -lcl
fm fmmodule.o -lfm_s -lgl_s
gl glmodule.o -lgl_s -lX11_s
imgfile imgfilemodule.o -limage -lgutil -lm
sgi sgimodule.o
sv svmodule.o yuvconvert.o -lsvideo -lXext -lX11_s

# The FORMS library, by Mark Overmars, implements user interface
# components such as dialogs and buttons using SGI's GL and FM
# libraries.  You must ftp the FORMS library separately from
# ftp://ftp.cs.ruu.nl/pub/SGI/FORMS.  It was tested with FORMS 2.2a.
# The FORMS variable must point to the FORMS subdirectory of the forms
# toplevel directory.

FORMS=/ufs/guido/src/forms/FORMS
fl flmodule.o -I$(FORMS) $(FORMS)/libforms.a


# SunOS specific modules -- off by default

# sunaudiodev sunaudiodevmodule.o


# Thread module -- works on SGI IRIX and on SunOS 5.x (SOLARIS) only.
# Note that you must have configured (and built!) Python with the
# --with-thread option passed to the configure script for this to work.

thread threadmodule.o


# GNN's timing module
timing timingmodule.o


# Example -- included for reference only

# xx xxmodule.o

--- NEW FILE: Setup.irix4 ---
# This file is used by the makesetup script to construct Makefile.in
# and config.c, from Makefile.in.in (sic!) and config.c.in,
# respectively.
#
# Each line in this file describes one or more optional modules.
# Comment out lines to suppress modules.
# Lines have the following structure:
#
# <module> ... [<objectfile> ...] [<cpparg> ...] [<library> ...]
#
# <objectfile> is anything ending in .o
# <cpparg> is anything starting with -I, -D, -U or -C
# <library> is anything ending in .a or beginning with -l or -L
# <module> is anything else but should be a valid Python
# identifier (letters, digits, underscores, beginning with non-digit)
#
# Lines can also have the form
#
# <name> = <value>
#
# which defines a Make variable definition inserted into Makefile.in
#
# NOTE: As a standard policy, as many modules as can be supported by a
# platform should be present.  The distribution comes with all modules
# enabled that are supported by most platforms and don't require you
# to ftp sources from elsewhere.  To make this easier for SGI
# platforms, you can copy Setup.sgi to Setup (or edit Makefile.in.in
# to use Setup.sgi instead of Setup).


# Modules that should always be present (non UNIX dependent)

array arraymodule.o	# array objects
math mathmodule.o	# math library functions, e.g. sin()
parser parsermodule.o	# raw interface to the Python parser
posix posixmodule.o	# posix (UNIX) system calls
regex regexmodule.o regexpr.o	# Regular expressions, GNU Emacs style
strop stropmodule.o	# fast string operations implemented in C
struct structmodule.o	# binary structure packing/unpacking
time timemodule.o	# time operations and variables


# Modules with some UNIX dependencies -- on by default.
# Note that some UNIX versions still don't support all of these
# so you may have to comment them out before the build completes.

dbm dbmmodule.o		# dbm(3) may require -ldbm or similar
fcntl fcntlmodule.o	# fcntl(2) and ioctl(2)
nis nismodule.o		# Sun yellow pages -- not everywhere
pwd grp pwdmodule.o	# pwd(3) and grp(3)
select selectmodule.o	# select(2); not on ancient System V
socket socketmodule.o	# socket(2); not on ancient System V


# Multimedia modules -- off by default
# These represent audio samples or images as strings

audioop audioopmodule.o # Operations on audio samples
imageop imageopmodule.o # Operations on images
rgbimg rgbimgmodule.o   # Read SGI RGB image files (but coded portably)


# The stdwin module provides a simple, portable (between X11 and Mac)
# windowing interface.  You need to ftp the STDWIN library, e.g. from
# ftp://ftp.cwi.nl/pub/stdwin.  The STDWIN variable must point to the
# STDWIN toplevel directory.  The ARCH variable must be set to the
# architecture identifier used to build STDWIN.  NB if you combine this
# with the gl module on an SGI machine, you should replace "-lX11" with
# "-lX11_s".

STDWIN=/ufs/guido/src/stdwin
ARCH=sgi
stdwin stdwinmodule.o -I$(STDWIN)/H $(STDWIN)/Build/$(ARCH)/x11/lib/lib.a -lX11_s


# The md5 module implements the RSA Data Security, Inc. MD5
# Message-Digest Algorithm, described in RFC 1321.  The necessary files
# md5c.c and md5.h are included here.

md5 md5module.o md5c.o


# The mpz module interfaces to the GNU Multiple Precision library.
# You need to ftp the GNU MP library.  This was last tested with a
# somewhat modified (to get around bugs) version of GMP 1.2; it will
# likely need some work for more recent versions.  The GMP variable
# must point to the GMP source directory.

GMP=/ufs/guido/src/gmp
mpz mpzmodule.o -I$(GMP) $(GMP)/libgmp.a


# The rotor module (contributed by Lance Ellinghouse) implements a
# rotor-based encryption algorithm.  It is self-contained.

rotor rotormodule.o


# SGI IRIX specific modules -- off by default.
# Switch this on if you have an SGI machine.
# Note that some required libraries and header files aren't always
# installed; you may be better off switching on only 'fm' and 'gl'
# (Font Manager and Graphics Library).

al almodule.o -laudio		# audio
cd cdmodule.o -lcdaudio -lds	#
cl clmodule.o -lcl
fm fmmodule.o -lfm_s -lgl_s
gl glmodule.o -lgl_s
imgfile imgfilemodule.o -limage -lgutil -lm
sgi sgimodule.o
sv svmodule.o yuvconvert.o -lsvideo -lXext -lX11_s

# The FORMS library, by Mark Overmars, implements user interface
# components such as dialogs and buttons using SGI's GL and FM
# libraries.  You must ftp the FORMS library separately from
# ftp://ftp.cs.ruu.nl/pub/SGI/FORMS.  It was tested with FORMS 2.2a.
# The FORMS variable must point to the FORMS subdirectory of the forms
# toplevel directory.

FORMS=/ufs/guido/src/forms/FORMS
fl flmodule.o -I$(FORMS) $(FORMS)/libforms.a


# SunOS specific modules -- off by default

# sunaudiodev sunaudiodevmodule.o


# Thread module -- works on SGI IRIX and on SunOS 5.x (SOLARIS) only.
# Note that you must have configured (and built!) Python with the
# --with-thread option passed to the configure script for this to work.

thread threadmodule.o


# Example -- included for reference only

# xx xxmodule.o

--- NEW FILE: Setup.irix5 ---
# Each line in this file describes one or more optional modules.
# Comment out lines to suppress modules.
# Lines have the following structure:
#
# <module> ... [<objectfile> ...] [<cpparg> ...] [<library> ...]
#
# <objectfile> is anything ending in .o
# <cpparg> is anything starting with -I, -D, -U or -C
# <library> is anything ending in .a or beginning with -l or -L
# <module> is anything else but should be a valid Python
# identifier (letters, digits, underscores, beginning with non-digit)
#
# Lines can also have the form
#
# <name> = <value>
#
# which defines a Make variable definition inserted into Makefile.in
#
# NOTE: As a standard policy, as many modules as can be supported by a
# platform should be present.  The distribution comes with all modules
# enabled that are supported by most platforms and don't require you
# to ftp sources from elsewhere.  To make this easier for SGI
# platforms, you can copy Setup.sgi to Setup (or edit Makefile.in.in
# to use Setup.sgi instead of Setup).


# Some special rules to define PYTHONPATH
# Edit the definitions below to indicate which options you are using

# Don't edit this (usually)
DESTLIB=$(prefix)/lib/python

# Standard enabled (tests are always available)
TESTPATH=:$(DESTLIB)/test

# Enable this for SGI systems
ARCHPATH=:$(DESTLIB)/sgi

# Enable this for Sun systems
#ARCHPATH=:$(DESTLIB)/sun4

# Enable this if stdwin installed
STDWINPATH=:$(DESTLIB)/stdwin

PYTHONPATH=.:$(DESTLIB)$(TESTPATH)$(ARCHPATH)$(STDWINPATH)


# Modules that should always be present (non UNIX dependent)

array arraymodule.o	# array objects
math mathmodule.o	# math library functions, e.g. sin()
parser parsermodule.o	# raw interface to the Python parser
posix posixmodule.o	# posix (UNIX) system calls
regex regexmodule.o regexpr.o	# Regular expressions, GNU Emacs style
strop stropmodule.o	# fast string operations implemented in C
struct structmodule.o	# binary structure packing/unpacking
time timemodule.o	# time operations and variables


# Modules with some UNIX dependencies -- on by default.
# Note that some UNIX versions still don't support all of these
# so you may have to comment them out before the build completes.

dbm dbmmodule.o		# dbm(3) may require -ldbm or similar
fcntl fcntlmodule.o	# fcntl(2) and ioctl(2)
nis nismodule.o		# Sun yellow pages -- not everywhere
pwd grp pwdmodule.o	# pwd(3) and grp(3)
crypt cryptmodule.o	# crypt(3)
select selectmodule.o	# select(2); not on ancient System V
socket socketmodule.o	# socket(2); not on ancient System V


# Multimedia modules -- on by default
# These represent audio samples or images as strings

audioop audioopmodule.o # Operations on audio samples
imageop imageopmodule.o # Operations on images
rgbimg rgbimgmodule.o   # Read SGI RGB image files (but coded portably)


# The stdwin module provides a simple, portable (between X11 and Mac)
# windowing interface.  You need to ftp the STDWIN library, e.g. from
# ftp://ftp.cwi.nl/pub/stdwin.  The STDWIN variable must point to the
# STDWIN toplevel directory.  The ARCH variable must be set to the
# architecture identifier used to build STDWIN.  NB if you combine this
# with the gl module on an SGI machine, you should replace "-lX11" with
# "-lX11_s".

#STDWIN=/ufs/guido/src/stdwin
#ARCH=sgi
#stdwin stdwinmodule.o -I$(STDWIN)/H $(STDWIN)/Build/$(ARCH)/x11/lib/lib.a -lX11_s


# The md5 module implements the RSA Data Security, Inc. MD5
# Message-Digest Algorithm, described in RFC 1321.  The necessary files
# md5c.c and md5.h are included here.

md5 md5module.o md5c.o


# The mpz module interfaces to the GNU Multiple Precision library.
# You need to ftp the GNU MP library.  This was last tested with a
# somewhat modified (to get around bugs) version of GMP 1.2; it will
# likely need some work for more recent versions.  The GMP variable
# must point to the GMP source directory.

#GMP=/ufs/guido/src/gmp
#mpz mpzmodule.o -I$(GMP) $(GMP)/libgmp.a


# The rotor module (contributed by Lance Ellinghouse) implements a
# rotor-based encryption algorithm.  It is self-contained.

rotor rotormodule.o


# SGI IRIX specific modules -- off by default.
# Switch this on if you have an SGI machine.
# Note that some required libraries and header files aren't always
# installed; you may be better off switching on only 'fm' and 'gl'
# (Font Manager and Graphics Library).

#al almodule.o -laudio
#cd cdmodule.o -lcdaudio -lds -lmediad
#cl clmodule.o -lcl -lawareaudio
fm fmmodule.o -lfm_s -lgl_s
gl glmodule.o -lgl_s -lX11_s
#imgfile imgfilemodule.o -limage -lgutil -lm
sgi sgimodule.o
#sv svmodule.o yuvconvert.o -lsvideo -lXext -lX11_s

# The FORMS library, by Mark Overmars, implements user interface
# components such as dialogs and buttons using SGI's GL and FM
# libraries.  You must ftp the FORMS library separately from
# ftp://ftp.cs.ruu.nl/pub/SGI/FORMS.  It was tested with FORMS 2.2a.
# The FORMS variable must point to the FORMS subdirectory of the forms
# toplevel directory.

#FORMS=/ufs/guido/src/forms/FORMS
#fl flmodule.o -I$(FORMS) $(FORMS)/libforms.a


# SunOS specific modules -- off by default

# sunaudiodev sunaudiodevmodule.o


# Thread module -- works on SGI IRIX and on SunOS 5.x (SOLARIS) only.
# Note that you must have configured (and built!) Python with the
# --with-thread option passed to the configure script for this to work.

thread threadmodule.o


# GNN's timing module
timing timingmodule.o


# Example -- included for reference only

# xx xxmodule.o

--- NEW FILE: Setup.minix ---
# Each line in this file describes one or more optional modules.
# Comment out lines to suppress modules.
# Lines have the following structure:
#
# <module> ... [<objectfile> ...] [<cpparg> ...] [<library> ...]
#
# <objectfile> is anything ending in .o
# <cpparg> is anything starting with -I, -D, -U or -C
# <library> is anything ending in .a or beginning with -l or -L
# <module> is anything else but should be a valid Python
# identifier (letters, digits, underscores, beginning with non-digit)
#
# Lines can also have the form
#
# <name> = <value>
#
# which defines a Make variable definition inserted into Makefile.in
#
# NOTE: As a standard policy, as many modules as can be supported by a
# platform should be present.  The distribution comes with all modules
# enabled that are supported by most platforms and don't require you
# to ftp sources from elsewhere.  To make this easier for SGI
# platforms, you can copy Setup.sgi to Setup (or edit Makefile.in.in
# to use Setup.sgi instead of Setup).


# Some special rules to define PYTHONPATH
# Edit the definitions below to indicate which options you are using

# Don't edit this (usually)
DESTLIB=$(prefix)/lib/python

# Standard enabled (tests are always available)
TESTPATH=:$(DESTLIB)/test

# Enable this for SGI systems
#ARCHPATH=:$(DESTLIB)/sgi

# Enable this for Sun systems
#ARCHPATH=:$(DESTLIB)/sun4

# Enable this if stdwin installed
#STDWINPATH=:$(DESTLIB)/stdwin

PYTHONPATH=.:$(DESTLIB)$(TESTPATH)$(ARCHPATH)$(STDWINPATH)


# Modules that should always be present (non UNIX dependent)

array arraymodule.o	# array objects
math mathmodule.o	# math library functions, e.g. sin()
parser parsermodule.o	# raw interface to the Python parser
posix posixmodule.o	# posix (UNIX) system calls
regex regexmodule.o regexpr.o	# Regular expressions, GNU Emacs style
strop stropmodule.o	# fast string operations implemented in C
struct structmodule.o	# binary structure packing/unpacking
time timemodule.o	# time operations and variables


# Modules with some UNIX dependencies -- on by default.
# Note that some UNIX versions still don't support all of these
# so you may have to comment them out before the build completes.

#dbm dbmmodule.o		# dbm(3) may require -ldbm or similar
fcntl fcntlmodule.o	# fcntl(2) and ioctl(2)
#nis nismodule.o		# Sun yellow pages -- not everywhere
pwd grp pwdmodule.o	# pwd(3) and grp(3)
crypt cryptmodule.o	# crypt(3)
#select selectmodule.o	# select(2); not on ancient System V
#socket socketmodule.o	# socket(2); not on ancient System V


# Multimedia modules -- on by default
# These represent audio samples or images as strings

#audioop audioopmodule.o # Operations on audio samples
#imageop imageopmodule.o # Operations on images
#rgbimg rgbimgmodule.o   # Read SGI RGB image files (but coded portably)


# The stdwin module provides a simple, portable (between X11 and Mac)
# windowing interface.  You need to ftp the STDWIN library, e.g. from
# ftp://ftp.cwi.nl/pub/stdwin.  The STDWIN variable must point to the
# STDWIN toplevel directory.  The ARCH variable must be set to the
# architecture identifier used to build STDWIN.  NB if you combine this
# with the gl module on an SGI machine, you should replace "-lX11" with
# "-lX11_s".

#STDWIN=/ufs/guido/src/stdwin
#ARCH=???
#stdwin stdwinmodule.o -I$(STDWIN)/H $(STDWIN)/Build/$(ARCH)/x11/lib/lib.a -lX11


# The md5 module implements the RSA Data Security, Inc. MD5
# Message-Digest Algorithm, described in RFC 1321.  The necessary files
# md5c.c and md5.h are included here.

md5 md5module.o md5c.o


# The mpz module interfaces to the GNU Multiple Precision library.
# You need to ftp the GNU MP library.  This was last tested with a
# somewhat modified (to get around bugs) version of GMP 1.2; it will
# likely need some work for more recent versions.  The GMP variable
# must point to the GMP source directory.

#GMP=/ufs/guido/src/gmp
#mpz mpzmodule.o -I$(GMP) $(GMP)/libgmp.a


# The rotor module (contributed by Lance Ellinghouse) implements a
# rotor-based encryption algorithm.  It is self-contained.

rotor rotormodule.o


# SGI IRIX specific modules -- off by default.
# Switch this on if you have an SGI machine.
# Note that some required libraries and header files aren't always
# installed; you may be better off switching on only 'fm' and 'gl'
# (Font Manager and Graphics Library).

#al almodule.o -laudio		# audio
#cd cdmodule.o -lcdaudio -lds	#
#cl clmodule.o -lcl
#fm fmmodule.o -lfm_s -lgl_s
#gl glmodule.o -lgl_s -lX11_s
#imgfile imgfilemodule.o -limage -lgutil -lm
#sgi sgimodule.o
#sv svmodule.o yuvconvert.o -lsvideo -lXext -lX11_s

# The FORMS library, by Mark Overmars, implements user interface
# components such as dialogs and buttons using SGI's GL and FM
# libraries.  You must ftp the FORMS library separately from
# ftp://ftp.cs.ruu.nl/pub/SGI/FORMS.  It was tested with FORMS 2.2a.
# The FORMS variable must point to the FORMS subdirectory of the forms
# toplevel directory.

#FORMS=/ufs/guido/src/forms/FORMS
#fl flmodule.o -I$(FORMS) $(FORMS)/libforms.a


# SunOS specific modules -- off by default

#sunaudiodev sunaudiodevmodule.o


# Thread module -- works on SGI IRIX and on SunOS 5.x (SOLARIS) only.
# Note that you must have configured (and built!) Python with the
# --with-thread option passed to the configure script for this to work.

# thread threadmodule.o


# GNN's timing module
timing timingmodule.o


# Example -- included for reference only

# xx xxmodule.o

--- NEW FILE: Setup.solaris2 ---
# This file is used by the makesetup script to construct Makefile.in
# and config.c, from Makefile.in.in (sic!) and config.c.in,
# respectively.
#
# Each line in this file describes one or more optional modules.
# Comment out lines to suppress modules.
# Lines have the following structure:
#
# <module> ... [<objectfile> ...] [<cpparg> ...] [<library> ...]
#
# <objectfile> is anything ending in .o
# <cpparg> is anything starting with -I, -D, -U or -C
# <library> is anything ending in .a or beginning with -l or -L
# <module> is anything else but should be a valid Python
# identifier (letters, digits, underscores, beginning with non-digit)
#
# Lines can also have the form
#
# <name> = <value>
#
# which defines a Make variable definition inserted into Makefile.in
#
# NOTE: As a standard policy, as many modules as can be supported by a
# platform should be present.  The distribution comes with all modules
# enabled that are supported by most platforms and don't require you
# to ftp sources from elsewhere.  To make this easier for SGI
# platforms, you can copy Setup.sgi to Setup (or edit Makefile.in.in
# to use Setup.sgi instead of Setup).


# Modules that should always be present (non UNIX dependent)

array arraymodule.o	# array objects
math mathmodule.o	# math library functions, e.g. sin()
parser parsermodule.o	# raw interface to the Python parser
posix posixmodule.o	# posix (UNIX) system calls
regex regexmodule.o regexpr.o	# Regular expressions, GNU Emacs style
strop stropmodule.o	# fast string operations implemented in C
struct structmodule.o	# binary structure packing/unpacking
time timemodule.o	# time operations and variables


# Modules with some UNIX dependencies -- on by default.
# Note that some UNIX versions still don't support all of these
# so you may have to comment them out before the build completes.

dbm dbmmodule.o		# dbm(3) may require -ldbm or similar
fcntl fcntlmodule.o	# fcntl(2) and ioctl(2)
nis nismodule.o		# Sun yellow pages -- not everywhere
pwd grp pwdmodule.o	# pwd(3) and grp(3)
select selectmodule.o	# select(2); not on ancient System V
socket socketmodule.o	# socket(2); not on ancient System V


# Multimedia modules -- off by default
# These represent audio samples or images as strings

audioop audioopmodule.o # Operations on audio samples
imageop imageopmodule.o # Operations on images
rgbimg rgbimgmodule.o   # Read SGI RGB image files (but coded portably)


# The stdwin module provides a simple, portable (between X11 and Mac)
# windowing interface.  You need to ftp the STDWIN library, e.g. from
# ftp://ftp.cwi.nl/pub/stdwin.  The STDWIN variable must point to the
# STDWIN toplevel directory.  The ARCH variable must be set to the
# architecture identifier used to build STDWIN.  NB if you combine this
# with the gl module on an SGI machine, you should replace "-lX11" with
# "-lX11_s".

#STDWIN=/ufs/guido/src/stdwin
#ARCH=sgi
#stdwin stdwinmodule.o -I$(STDWIN)/H $(STDWIN)/Build/$(ARCH)/x11/lib/lib.a -lX11


# The md5 module implements the RSA Data Security, Inc. MD5
# Message-Digest Algorithm, described in RFC 1321.  The necessary files
# md5c.c and md5.h are included here.

md5 md5module.o md5c.o


# The mpz module interfaces to the GNU Multiple Precision library.
# You need to ftp the GNU MP library.  This was last tested with a
# somewhat modified (to get around bugs) version of GMP 1.2; it will
# likely need some work for more recent versions.  The GMP variable
# must point to the GMP source directory.

#GMP=/ufs/guido/src/gmp
#mpz mpzmodule.o -I$(GMP) $(GMP)/libgmp.a


# The rotor module (contributed by Lance Ellinghouse) implements a
# rotor-based encryption algorithm.  It is self-contained.

rotor rotormodule.o


# SGI IRIX specific modules -- off by default.
# Switch this on if you have an SGI machine.
# Note that some required libraries and header files aren't always
# installed; you may be better off switching on only 'fm' and 'gl'
# (Font Manager and Graphics Library).

#al almodule.o -laudio		# audio
#cd cdmodule.o -lcdaudio -lds	#
#cl clmodule.o -lcl
#fm fmmodule.o -lfm_s -lgl_s
#gl glmodule.o -lgl_s
#imgfile imgfilemodule.o -limage -lgutil -lm
#sgi sgimodule.o
#sv svmodule.o yuvconvert.o -lsvideo -lXext -lX11_s

# The FORMS library, by Mark Overmars, implements user interface
# components such as dialogs and buttons using SGI's GL and FM
# libraries.  You must ftp the FORMS library separately from
# ftp://ftp.cs.ruu.nl/pub/SGI/FORMS.  It was tested with FORMS 2.2a.
# The FORMS variable must point to the FORMS subdirectory of the forms
# toplevel directory.

#FORMS=/ufs/guido/src/forms/FORMS
#fl flmodule.o -I$(FORMS) $(FORMS)/libforms.a


# SunOS specific modules -- off by default

sunaudiodev sunaudiodevmodule.o


# Thread module -- works on SGI IRIX and on SunOS 5.x (SOLARIS) only.
# Note that you must have configured (and built!) Python with the
# --with-thread option passed to the configure script for this to work.

thread threadmodule.o


# Example -- included for reference only

# xx xxmodule.o

--- NEW FILE: Setup.sunos4 ---
# This file is used by the makesetup script to construct Makefile.in
# and config.c, from Makefile.in.in (sic!) and config.c.in,
# respectively.
#
# Each line in this file describes one or more optional modules.
# Comment out lines to suppress modules.
# Lines have the following structure:
#
# <module> ... [<objectfile> ...] [<cpparg> ...] [<library> ...]
#
# <objectfile> is anything ending in .o
# <cpparg> is anything starting with -I, -D, -U or -C
# <library> is anything ending in .a or beginning with -l or -L
# <module> is anything else but should be a valid Python
# identifier (letters, digits, underscores, beginning with non-digit)
#
# Lines can also have the form
#
# <name> = <value>
#
# which defines a Make variable definition inserted into Makefile.in
#
# NOTE: As a standard policy, as many modules as can be supported by a
# platform should be present.  The distribution comes with all modules
# enabled that are supported by most platforms and don't require you
# to ftp sources from elsewhere.  To make this easier for SGI
# platforms, you can copy Setup.sgi to Setup (or edit Makefile.in.in
# to use Setup.sgi instead of Setup).


# Modules that should always be present (non UNIX dependent)

array arraymodule.o	# array objects
math mathmodule.o	# math library functions, e.g. sin()
parser parsermodule.o	# raw interface to the Python parser
posix posixmodule.o	# posix (UNIX) system calls
regex regexmodule.o regexpr.o	# Regular expressions, GNU Emacs style
strop stropmodule.o	# fast string operations implemented in C
struct structmodule.o	# binary structure packing/unpacking
time timemodule.o	# time operations and variables


# Modules with some UNIX dependencies -- on by default.
# Note that some UNIX versions still don't support all of these
# so you may have to comment them out before the build completes.

dbm dbmmodule.o		# dbm(3) may require -ldbm or similar
fcntl fcntlmodule.o	# fcntl(2) and ioctl(2)
nis nismodule.o		# Sun yellow pages -- not everywhere
pwd grp pwdmodule.o	# pwd(3) and grp(3)
select selectmodule.o	# select(2); not on ancient System V
socket socketmodule.o	# socket(2); not on ancient System V


# Multimedia modules -- off by default
# These represent audio samples or images as strings

audioop audioopmodule.o # Operations on audio samples
imageop imageopmodule.o # Operations on images
rgbimg rgbimgmodule.o   # Read SGI RGB image files (but coded portably)


# The stdwin module provides a simple, portable (between X11 and Mac)
# windowing interface.  You need to ftp the STDWIN library, e.g. from
# ftp://ftp.cwi.nl/pub/stdwin.  The STDWIN variable must point to the
# STDWIN toplevel directory.  The ARCH variable must be set to the
# architecture identifier used to build STDWIN.  NB if you combine this
# with the gl module on an SGI machine, you should replace "-lX11" with
# "-lX11_s".

#STDWIN=/ufs/guido/src/stdwin
#ARCH=sgi
#stdwin stdwinmodule.o -I$(STDWIN)/H $(STDWIN)/Build/$(ARCH)/x11/lib/lib.a -lX11


# The md5 module implements the RSA Data Security, Inc. MD5
# Message-Digest Algorithm, described in RFC 1321.  The necessary files
# md5c.c and md5.h are included here.

md5 md5module.o md5c.o


# The mpz module interfaces to the GNU Multiple Precision library.
# You need to ftp the GNU MP library.  This was last tested with a
# somewhat modified (to get around bugs) version of GMP 1.2; it will
# likely need some work for more recent versions.  The GMP variable
# must point to the GMP source directory.

#GMP=/ufs/guido/src/gmp
#mpz mpzmodule.o -I$(GMP) $(GMP)/libgmp.a


# The rotor module (contributed by Lance Ellinghouse) implements a
# rotor-based encryption algorithm.  It is self-contained.

rotor rotormodule.o


# SGI IRIX specific modules -- off by default.
# Switch this on if you have an SGI machine.
# Note that some required libraries and header files aren't always
# installed; you may be better off switching on only 'fm' and 'gl'
# (Font Manager and Graphics Library).

#al almodule.o -laudio		# audio
#cd cdmodule.o -lcdaudio -lds	#
#cl clmodule.o -lcl
#fm fmmodule.o -lfm_s -lgl_s
#gl glmodule.o -lgl_s
#imgfile imgfilemodule.o -limage -lgutil -lm
#sgi sgimodule.o
#sv svmodule.o yuvconvert.o -lsvideo -lXext -lX11_s

# The FORMS library, by Mark Overmars, implements user interface
# components such as dialogs and buttons using SGI's GL and FM
# libraries.  You must ftp the FORMS library separately from
# ftp://ftp.cs.ruu.nl/pub/SGI/FORMS.  It was tested with FORMS 2.2a.
# The FORMS variable must point to the FORMS subdirectory of the forms
# toplevel directory.

#FORMS=/ufs/guido/src/forms/FORMS
#fl flmodule.o -I$(FORMS) $(FORMS)/libforms.a


# SunOS specific modules -- off by default

sunaudiodev sunaudiodevmodule.o


# Thread module -- works on SGI IRIX and on SunOS 5.x (SOLARIS) only.
# Note that you must have configured (and built!) Python with the
# --with-thread option passed to the configure script for this to work.

# thread threadmodule.o


# Example -- included for reference only

# xx xxmodule.o

--- NEW FILE: imgformat.c ---
/***********************************************************
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
Amsterdam, The Netherlands.

                        All Rights Reserved

Permission to use, copy, modify, and distribute this software and its 
documentation for any purpose and without fee is hereby granted, 
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in 
supporting documentation, and that the names of Stichting Mathematisch
Centrum or CWI not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior permission.

STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

******************************************************************/

/* Imgformat objects */

#include "allobjects.h"
#include "modsupport.h"		/* For getargs() etc. */

typedef struct {
	OB_HEAD
	char    *name;
} imgformatobject;

staticforward typeobject Imgformattype;

#define is_imgformatobject(v)		((v)->ob_type == &Imgformattype)

static object *dict;			/* Dictionary of known types */

static imgformatobject *
newimgformatobject(name)
	char *name;
{
	imgformatobject *xp;
	xp = NEWOBJ(imgformatobject, &Imgformattype);
	if (xp == NULL)
		return NULL;
	if( (xp->name = malloc(strlen(name)+1)) == NULL ) {
	    DEL(xp);
	    return (imgformatobject *)err_nomem();
	}
	strcpy(xp->name, name);
	return xp;
}

/* Imgformat methods */

static void
imgformat_dealloc(xp)
	imgformatobject *xp;
{
	free(xp->name);
	DEL(xp);
}

static object *
imgformat_repr(self)
	imgformatobject *self;
{
	char buf[100];

	sprintf(buf, "<imgformat '%.70s' at %x>", self->name, self);
	return newstringobject(buf);
}

static struct methodlist imgformat_methods[] = {
	{NULL,		NULL}		/* sentinel */
};

static typeobject Imgformattype = {
	OB_HEAD_INIT(&Typetype)
	0,			/*ob_size*/
	"imgformat",		/*tp_name*/
	sizeof(imgformatobject), /*tp_basicsize*/
	0,			/*tp_itemsize*/
	/* methods */
	(destructor)imgformat_dealloc, /*tp_dealloc*/
	0,			/*tp_print*/
	0,			 /*tp_getattr*/
	0,			 /*tp_setattr*/
	0,			/*tp_compare*/
	(reprfunc)imgformat_repr, /*tp_repr*/
	0,			/*tp_as_number*/
	0,			/*tp_as_sequence*/
	0,			/*tp_as_mapping*/
	0,			/*tp_hash*/
};


static object *
imgformat_new(self, args)
	object *self; /* Not used */
	object *args;
{
	char *name, *descr;
	object *obj;
	
	if (!getargs(args, "(ss)", &name, &descr))
		return NULL;
	obj = (object *)newimgformatobject(descr);
	if (obj == NULL)
		return NULL;
	if (dictinsert(dict, name, obj) != 0) {
		DECREF(obj);
		return NULL;
	}
	return obj;
}

/* Helper function for other modules, to obtain imgformat-by-name */
object *
getimgformat(name)
	char *name;
{
	return dictlookup(dict, name);
}

/* List of functions defined in the module */

static struct methodlist imgformat_module_methods[] = {
	{"new",		imgformat_new},
	{NULL,		NULL}		/* sentinel */
};


/* Initialization function for the module (*must* be called initimgformat) */

void
initimgformat()
{
	object *m, *d, *x;

	/* Create the module and add the functions */
	m = initmodule("imgformat", imgformat_module_methods);

	dict = getmoduledict(m);

	x = (object *)newimgformatobject("SGI 32bit RGB(A) top-to-bottom");
	dictinsert(dict, "rgb", x);

	x = (object *)newimgformatobject("SGI 32bit RGB(A) bottom-to-top");
	dictinsert(dict, "rgb_b2t", x);

	x = (object *)newimgformatobject("SGI 3:3:2 RGB top-to-bottom");
	dictinsert(dict, "rgb8", x);

	x = (object *)newimgformatobject("SGI 3:3:2 RGB bottom-to-top");
	dictinsert(dict, "rgb8_b2t", x);

	x = (object *)newimgformatobject("SGI 8bit grey top-to-bottom");
	dictinsert(dict, "grey", x);

	x = (object *)newimgformatobject("SGI 8bit grey bottom-to-top");
	dictinsert(dict, "grey_b2t", x);

	x = (object *)newimgformatobject("SGI 8bit colormap top-to-bottom");
	dictinsert(dict, "colormap", x);

	x = (object *)newimgformatobject("SGI 8bit colormap bottom-to-top");
	dictinsert(dict, "colormap_b2t", x);


	/* Check for errors */
	if (err_occurred())
		fatal("can't initialize module imgformat");
}

--- NEW FILE: version.c ---
/***********************************************************
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
Amsterdam, The Netherlands.

                        All Rights Reserved

Permission to use, copy, modify, and distribute this software and its 
documentation for any purpose and without fee is hereby granted, 
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in 
supporting documentation, and that the names of Stichting Mathematisch
Centrum or CWI not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior permission.

STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

******************************************************************/

/* Python version information */

#include "patchlevel.h"

/* Return the version string.  This is constructed from the official
   version number, the patch level, and the current date (if known to
   the compiler, else a manually inserted date). */

#define VERSION "1.0.%d++ (%s)"

#ifdef __DATE__
#define DATE __DATE__
#else
#define DATE "18 May 1994"
#endif

char *
getversion()
{
	static char version[80];
	sprintf(version, VERSION, PATCHLEVEL, DATE);
	return version;
}


/* Return the copyright string.  This is updated manually. */

char *
getcopyright()
{
	return "Copyright 1991-1994 Stichting Mathematisch Centrum, Amsterdam";
}

Index: main.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/main.c,v
retrieving revision 1.52.4.1
retrieving revision 1.52.4.2
diff -C2 -r1.52.4.1 -r1.52.4.2
*** main.c	2001/07/07 22:55:29	1.52.4.1
--- main.c	2001/07/16 21:46:00	1.52.4.2
***************
*** 299,303 ****
  	}
  
! 	cf.cf_nested_scopes = 0;
  
  	if (command) {
--- 299,303 ----
  	}
  
! 	cf.cf_flags = 0;
  
  	if (command) {

Index: mmapmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/mmapmodule.c,v
retrieving revision 2.28.2.1
retrieving revision 2.28.2.2
diff -C2 -r2.28.2.1 -r2.28.2.2
*** mmapmodule.c	2001/07/07 22:55:29	2.28.2.1
--- mmapmodule.c	2001/07/16 21:46:00	2.28.2.2
***************
*** 664,667 ****
--- 664,672 ----
  		ihigh = self->size;
      
+ 	if (v == NULL) {
+ 		PyErr_SetString(PyExc_TypeError,
+ 			"mmap object doesn't support slice deletion");
+ 		return -1;
+ 	}
  	if (! (PyString_Check(v)) ) {
  		PyErr_SetString(PyExc_IndexError, 
***************
*** 687,690 ****
--- 692,700 ----
  	if (i < 0 || (size_t)i >= self->size) {
  		PyErr_SetString(PyExc_IndexError, "mmap index out of range");
+ 		return -1;
+ 	}
+ 	if (v == NULL) {
+ 		PyErr_SetString(PyExc_TypeError,
+ 			"mmap object doesn't support item deletion");
  		return -1;
  	}