svn commit: samba r25337 - in branches/4.0-python: .
source/lib/python source/lib/python/Lib
jelmer at samba.org
jelmer at samba.org
Wed Sep 26 01:34:33 GMT 2007
Author: jelmer
Date: 2007-09-26 01:34:32 +0000 (Wed, 26 Sep 2007)
New Revision: 25337
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25337
Log:
Remove more cruft.
Removed:
branches/4.0-python/source/lib/python/Lib/lib-tk/
branches/4.0-python/source/lib/python/Lib/msilib/
Modified:
branches/4.0-python/
branches/4.0-python/source/lib/python/config.m4
Changeset:
Property changes on: branches/4.0-python
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-python/source/lib/python/config.m4
===================================================================
--- branches/4.0-python/source/lib/python/config.m4 2007-09-26 01:34:29 UTC (rev 25336)
+++ branches/4.0-python/source/lib/python/config.m4 2007-09-26 01:34:32 UTC (rev 25337)
@@ -249,128 +249,6 @@
AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t,
[The number of bytes in a time_t.])
-
-AC_SUBST(OTHER_LIBTOOL_OPT)
-case $ac_sys_system/$ac_sys_release in
- Darwin/@<:@01567@:>@\..*)
- OTHER_LIBTOOL_OPT="-prebind -seg1addr 0x10000000"
- ;;
- Darwin/*)
- OTHER_LIBTOOL_OPT=""
- ;;
-esac
-
-AC_SUBST(LIBTOOL_CRUFT)
-case $ac_sys_system/$ac_sys_release in
- Darwin/@<:@01567@:>@\..*)
- LIBTOOL_CRUFT="-framework System -lcc_dynamic"
- if test "${enable_universalsdk}"; then
- :
- else
- LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
- fi
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
- Darwin/*)
- gcc_version=`gcc -v 2>&1 | grep version | cut -d\ -f3`
- if test ${gcc_version} '<' 4.0
- then
- LIBTOOL_CRUFT="-lcc_dynamic"
- else
- LIBTOOL_CRUFT=""
- fi
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
-esac
-
-AC_MSG_CHECKING(for dyld)
-case $ac_sys_system/$ac_sys_release in
- Darwin/*)
- AC_DEFINE(WITH_DYLD, 1,
- [Define if you want to use the new-style (Openstep, Rhapsody, MacOS)
- dynamic linker (dyld) instead of the old-style (NextStep) dynamic
- linker (rld). Dyld is necessary to support frameworks.])
- AC_MSG_RESULT(always on for Darwin)
- ;;
- *)
- AC_MSG_RESULT(no)
- ;;
-esac
-
-# Set info about shared libraries.
-AC_SUBST(SO)
-AC_SUBST(LDSHARED)
-AC_SUBST(BLDSHARED)
-AC_SUBST(CCSHARED)
-AC_SUBST(LINKFORSHARED)
-# SO is the extension of shared libraries `(including the dot!)
-# -- usually .so, .sl on HP-UX, .dll on Cygwin
-AC_MSG_CHECKING(SO)
-if test -z "$SO"
-then
- case $ac_sys_system in
- hp*|HP*)
- case `uname -m` in
- ia64) SO=.so;;
- *) SO=.sl;;
- esac
- ;;
- CYGWIN*) SO=.dll;;
- *) SO=.so;;
- esac
-else
- # this might also be a termcap variable, see #610332
- echo
- echo '====================================================================='
- echo '+ +'
- echo '+ WARNING: You have set SO in your environment. +'
- echo '+ Do you really mean to change the extension for shared libraries? +'
- echo '+ Continuing in 10 seconds to let you to ponder. +'
- echo '+ +'
- echo '====================================================================='
- sleep 10
-fi
-AC_MSG_RESULT($SO)
-AC_MSG_RESULT($LDSHARED)
-BLDSHARED=${BLDSHARED-$LDSHARED}
-# CCSHARED are the C *flags* used to create objects to go into a shared
-# library (module) -- this is only needed for a few systems
-AC_MSG_CHECKING(CCSHARED)
-if test -z "$CCSHARED"
-then
- case $ac_sys_system/$ac_sys_release in
- SunOS*) if test "$GCC" = yes;
- then CCSHARED="-fPIC";
- elif test `uname -p` = sparc;
- then CCSHARED="-xcode=pic32";
- else CCSHARED="-Kpic";
- fi;;
- hp*|HP*) if test "$GCC" = yes;
- then CCSHARED="-fPIC";
- else CCSHARED="+z";
- fi;;
- Linux*|GNU*) CCSHARED="-fPIC";;
- BSD/OS*/4*) CCSHARED="-fpic";;
- FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
- OpenUNIX*|UnixWare*)
- if test "$GCC" = "yes"
- then CCSHARED="-fPIC"
- else CCSHARED="-KPIC"
- fi;;
- SCO_SV*)
- if test "$GCC" = "yes"
- then CCSHARED="-fPIC"
- else CCSHARED="-Kpic -belf"
- fi;;
- Monterey*) CCSHARED="-G";;
- IRIX*/6*) case $CC in
- *gcc*) CCSHARED="-shared";;
- *) CCSHARED="";;
- esac;;
- atheos*) CCSHARED="-fPIC";;
- esac
-fi
AC_MSG_RESULT($CCSHARED)
# LINKFORSHARED are the flags passed to the $(CC) command that links
# the python executable -- this is only needed for a few systems
@@ -467,19 +345,6 @@
fi
AC_MSG_RESULT($with_system_ffi)
-# This is used to generate Setup.config
-AC_SUBST(USE_THREAD_MODULE)
-USE_THREAD_MODULE=""
-
-# Templates for things AC_DEFINEd more than once.
-# For a single AC_DEFINE, no template is needed.
-AH_TEMPLATE(C_THREADS,[Define if you have the Mach cthreads package])
-AH_TEMPLATE(_REENTRANT,
- [Define to force use of thread-safe errno, h_errno, and other functions])
-AH_TEMPLATE(WITH_THREAD,
- [Define if you want to compile in rudimentary thread support])
-
-AC_SUBST(THREADOBJ)
USE_THREAD_MODULE="#"
# Check for --with-doc-strings
More information about the samba-cvs
mailing list