Author: jelmer Date: 2007-09-26 01:34:20 +0000 (Wed, 26 Sep 2007) New Revision: 25333
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25333 Log: Some more changes to the python build, add bzrignore. Modified: branches/4.0-python/ branches/4.0-python/.bzrignore branches/4.0-python/source/lib/python/config.m4 Changeset: Property changes on: branches/4.0-python ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/4.0-python/.bzrignore =================================================================== --- branches/4.0-python/.bzrignore 2007-09-26 01:34:16 UTC (rev 25332) +++ branches/4.0-python/.bzrignore 2007-09-26 01:34:20 UTC (rev 25333) @@ -202,3 +202,8 @@ torture/winbind/proto.h source/rpc_server/lsa/proto.h source/torture/winbind/proto.h +source/lib/python/Modules/config.c +source/lib/python/Modules/Setup.local +source/lib/python/Modules/Setup.local +source/lib/python/Modules/Setup +source/lib/python/Modules/Setup.config Modified: branches/4.0-python/source/lib/python/config.m4 =================================================================== --- branches/4.0-python/source/lib/python/config.m4 2007-09-26 01:34:16 UTC (rev 25332) +++ branches/4.0-python/source/lib/python/config.m4 2007-09-26 01:34:20 UTC (rev 25333) @@ -178,122 +178,6 @@ CONFIGURE_MACOSX_DEPLOYMENT_TARGET= EXPORT_MACOSX_DEPLOYMENT_TARGET='#' -# checks for alternative programs - -# compiler flags are generated in two sets, BASECFLAGS and OPT. OPT is just -# for debug/optimization stuff. BASECFLAGS is for flags that are required -# just to get things to compile and link. Users are free to override OPT -# when running configure or make. The build should not break if they do. -# BASECFLAGS should generally not be messed with, however. - -# XXX shouldn't some/most/all of this code be merged with the stuff later -# on that fiddles with OPT and BASECFLAGS? -AC_MSG_CHECKING(for --without-gcc) -AC_ARG_WITH(gcc, - AC_HELP_STRING(--without-gcc,never use gcc), -[ - case $withval in - no) CC=cc - without_gcc=yes;; - yes) CC=gcc - without_gcc=no;; - *) CC=$withval - without_gcc=$withval;; - esac], [ - case $ac_sys_system in - AIX*) CC=cc_r - without_gcc=;; - BeOS*) - case $BE_HOST_CPU in - ppc) - CC=mwcc - without_gcc=yes - BASECFLAGS="$BASECFLAGS -export pragma" - OPT="$OPT -O" - LDFLAGS="$LDFLAGS -nodup" - ;; - x86) - CC=gcc - without_gcc=no - OPT="$OPT -O" - ;; - *) - AC_MSG_ERROR([Unknown BeOS platform "$BE_HOST_CPU"]) - ;; - esac - AR="\$(srcdir)/lib/python/Modules/ar_beos" - RANLIB=: - ;; - Monterey*) - RANLIB=: - without_gcc=;; - *) without_gcc=no;; - esac]) -AC_MSG_RESULT($without_gcc) - -# If the user switches compilers, we can't believe the cache -if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC" -then - AC_MSG_ERROR([cached CC is different -- throw away $cache_file -(it is also a good idea to do 'make clean' before compiling)]) -fi - -AC_PROG_CC - -AC_SUBST(CXX) -AC_SUBST(MAINCC) -AC_MSG_CHECKING(for --with-cxx-main=<compiler>) -AC_ARG_WITH(cxx_main, - AC_HELP_STRING([--with-cxx-main=<compiler>], - [compile main() and link python executable with C++ compiler]), -[ - - case $withval in - no) with_cxx_main=no - MAINCC='$(CC)';; - yes) with_cxx_main=yes - MAINCC='$(CXX)';; - *) with_cxx_main=yes - MAINCC=$withval - if test -z "$CXX" - then - CXX=$withval - fi;; - esac], [ - with_cxx_main=no - MAINCC='$(CC)' -]) -AC_MSG_RESULT($with_cxx_main) - -preset_cxx="$CXX" -if test -z "$CXX" -then - case "$CC" in - gcc) AC_PATH_PROG(CXX, [g++], [g++], [notfound]) ;; - cc) AC_PATH_PROG(CXX, [c++], [c++], [notfound]) ;; - esac - if test "$CXX" = "notfound" - then - CXX="" - fi -fi -if test -z "$CXX" -then - AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, notfound) - if test "$CXX" = "notfound" - then - CXX="" - fi -fi -if test "$preset_cxx" != "$CXX" -then - AC_MSG_WARN([ - - By default, distutils will build C++ extension modules with "$CXX". - If this is not intended, then set CXX on the configure command line. - ]) -fi - # Check for unsupported systems case $ac_sys_system/$ac_sys_release in Linux*/1*) @@ -325,14 +209,6 @@ esac -AC_SUBST(LIBRARY) -AC_MSG_CHECKING(LIBRARY) -if test -z "$LIBRARY" -then - LIBRARY='libpython$(VERSION).a' -fi -AC_MSG_RESULT($LIBRARY) - # LDLIBRARY is the name of the library to link against (as opposed to the # name of the library into which to insert object files). BLDLIBRARY is also # the library to link against, usually. On Mac OS X frameworks, BLDLIBRARY @@ -359,50 +235,8 @@ LDLIBRARYDIR='' RUNSHARED='' -# LINKCC is the command that links the python executable -- default is $(CC). -# If CXX is set, and if it is needed to link a main function that was -# compiled with CXX, LINKCC is CXX instead. Always using CXX is undesirable: -# python might then depend on the C++ runtime -# This is altered for AIX in order to build the export list before -# linking. -AC_SUBST(LINKCC) -AC_MSG_CHECKING(LINKCC) -if test -z "$LINKCC" -then - LINKCC='$(PURIFY) $(MAINCC)' - case $ac_sys_system in - AIX*) - exp_extra="\"\"" - if test $ac_sys_release -ge 5 -o \ - $ac_sys_release -eq 4 -a `uname -r` -ge 2 ; then - exp_extra="." - fi - LINKCC="\$(srcdir)/lib/python/Modules/makexp_aix lib/python/Modules/python.exp $exp_extra \$(LIBRARY); $LINKCC";; - Monterey64*) - LINKCC="$LINKCC -L/usr/lib/ia64l64";; - esac -fi -AC_MSG_RESULT($LINKCC) - -enable_shared="yes" - AC_MSG_CHECKING(LDLIBRARY) -# MacOSX framework builds need more magic. LDLIBRARY is the dynamic -# library that we build, but we do not want to link against it (we -# will find it with a -framework option). For this reason there is an -# extra variable BLDLIBRARY against which Python and the extension -# modules are linked, BLDLIBRARY. This is normally the same as -# LDLIBRARY, but empty for MacOSX framework builds. -if test "$enable_framework" -then - LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' - RUNSHARED=DYLD_FRAMEWORK_PATH="`pwd`:$DYLD_FRAMEWORK_PATH" - BLDLIBRARY='' -else - BLDLIBRARY='$(LDLIBRARY)' -fi - # Other platforms follow if test $enable_shared = "yes"; then AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.]) @@ -469,15 +303,6 @@ AC_SUBST(AR) AC_CHECK_PROGS(AR, ar aal, ar) -AC_SUBST(SVNVERSION) -AC_CHECK_PROG(SVNVERSION, svnversion, found, not-found) -if test $SVNVERSION = found -then - SVNVERSION="svnversion \$(srcdir)" -else - SVNVERSION="echo exported" -fi - case $MACHDEP in bsdos*|hp*|HP*) # install -d does not work on BSDI or HP-UX
