projects / packages / python.git / blame
| Commit | Line | Data |
|---|---|---|
| bde5d589 | 1 | diff -Nur Python-2.5.2.orig/configure.in Python-2.5.2/configure.in |
| 2 | --- Python-2.5.2.orig/configure.in 2008-02-13 19:17:17.000000000 +0000 | |
| 3 | +++ Python-2.5.2/configure.in 2008-02-26 09:43:17.000000000 +0000 | |
| 4 | @@ -767,13 +767,13 @@ | |
| ca37566f | 5 | if test "$Py_DEBUG" = 'true' ; then |
| 6 | # Optimization messes up debuggers, so turn it off for | |
| a7c5cbca | 7 | # debug builds. |
| 21748cff | 8 | - OPT="-g -O0 -Wall $STRICT_PROTO" |
| ca37566f | 9 | + OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO" |
| a7c5cbca | 10 | else |
| bde5d589 | 11 | - OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" |
| 12 | + OPT="-g $WRAP $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO" | |
| 9d0d4238 | 13 | fi |
| 14 | ;; | |
| a7c5cbca | 15 | *) |
| ca37566f | 16 | - OPT="-O3 -Wall $STRICT_PROTO" |
| 17 | + OPT="$CPPFLAGS $CFLAGS -Wall $STRICT_PROTO" | |
| 9d0d4238 | 18 | ;; |
| a7c5cbca | 19 | esac |
| 9d0d4238 | 20 | case $ac_sys_system in |
| 21748cff AM |
21 | --- Python-2.7/Makefile.pre.in~ 2010-04-12 02:10:46.000000000 +0200 |
| 22 | +++ Python-2.7/Makefile.pre.in 2010-07-05 20:04:00.942224202 +0200 | |
| 132c1a2a AM |
23 | @@ -831,7 +831,7 @@ |
| 24 | fi; \ | |
| 25 | done | |
| 26 | $(INSTALL_DATA) $(srcdir)/Misc/python.man \ | |
| 27 | - $(DESTDIR)$(MANDIR)/man1/python$(VERSION).1 | |
| 28 | + $(DESTDIR)$(MANDIR)/man1/python.1 | |
| 29 | ||
| 30 | # Install the library | |
| 31 | PLATDIR= plat-$(MACHDEP) | |
| 21748cff AM |
32 | @@ -953,7 +953,7 @@ |
| 33 | python-config: $(srcdir)/Misc/python-config.in | |
| 65cc7ea0 | 34 | # Substitution happens here, as the completely-expanded BINDIR |
| 35 | # is not available in configure | |
| 36 | - sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config | |
| 37 | + sed -e "s,@EXENAME@,$(BINDIR)/python$(EXE)," < $(srcdir)/Misc/python-config.in >python-config | |
| 21748cff AM |
38 | |
| 39 | # Install the include files | |
| 40 | INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) | |
| 3f629a49 JB |
41 | --- Python-2.7/configure.in.orig 2010-07-09 10:02:40.053393415 +0200 |
| 42 | +++ Python-2.7/configure.in 2010-07-09 20:22:36.345392577 +0200 | |
| 43 | @@ -5,14 +5,7 @@ | |
| 44 | # Set VERSION so we only need to edit in one place (i.e., here) | |
| 45 | m4_define(PYTHON_VERSION, 2.7) | |
| 46 | ||
| 47 | -dnl Some m4 magic to ensure that the configure script is generated | |
| 48 | -dnl by the correct autoconf version. | |
| 49 | -m4_define([version_required], | |
| 50 | -[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [$1]), 0, | |
| 51 | - [], | |
| 52 | - [m4_fatal([Autoconf version $1 is required for Python], 63)]) | |
| 53 | -]) | |
| 54 | -version_required(2.65) | |
| 55 | +AC_PREREQ([2.65]) | |
| 56 | ||
| 57 | AC_REVISION($Revision$) | |
| 58 | AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/) |