* Modules/Setup.*: removed all except Setup.in (huh? I thought

	I'd done that already?!); disable gdbm by default
	* configure.in, */Makefile*.in: OPT can now be specified in the
	env at configure time and will then be put in all Makefiles as
	default
	* */Makefile*.in: remove lib*.a before adding to it

diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in
index 847412fd9dbcbfcb334f115b42542d7d20eae9ec..c05f4d7b628d237636e333ab7e5e1091dd20921a 100644 (file)
--- a/Modules/Makefile.pre.in
+++ b/Modules/Makefile.pre.in
@@ -34,7 +34,7 @@ prefix=               /usr/local
 # === Variables that are customizable by hand ===
 
 INCLDIR=       $(srcdir)/../Include
-OPT=           -O
+OPT=           @OPT@
 CFLAGS=                $(OPT) -I$(INCLDIR) -I.. $(DEFS)
 
 MKDEP=         mkdep
@@ -61,6 +61,7 @@ SYSLIBS=      $(LIBM) $(LIBC)
 all:           $(LIB) ../python
 
 $(LIB):                $(OBJS)
+               -rm -f $(LIB)
                $(AR) cr $(LIB) $(OBJS)
                $(RANLIB) $(LIB)
 

diff --git a/Modules/Setup.in b/Modules/Setup.in
index 04157d4bf0b51c66b077172c85a953e4ac86a627..82a26cc5fdf73427658debcffdddd9f5b8a23529 100644 (file)
--- a/Modules/Setup.in
+++ b/Modules/Setup.in
@@ -205,7 +205,7 @@ rotor rotormodule.o
 
 # Anthony Baxter's gdbm module (derived from Jack's dbm module)
 # GNU dbm(3) will require -lgdbm
-gdbm gdbmmodule.o -I/usr/local/include -L/usr/local/lib -lgdbm
+# gdbm gdbmmodule.o -I/usr/local/include -L/usr/local/lib -lgdbm
 
 
 # Example -- included for reference only