[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-392-g9041e38

Jelmer Vernooij jelmer at samba.org
Sun Jan 13 13:59:39 GMT 2008


The branch, v4-0-test has been updated
       via  9041e385fe666c16d9a5b9a030b54a856f17e5e5 (commit)
      from  e179db6d0fcf093082f2ad441980a2bb77ac6b17 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 9041e385fe666c16d9a5b9a030b54a856f17e5e5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Jan 13 14:59:16 2008 +0100

    python: Avoid overwriting flags for already found version of Python.

-----------------------------------------------------------------------

Summary of changes:
 source/scripting/python/config.m4 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/scripting/python/config.m4 b/source/scripting/python/config.m4
index b088447..4f46f92 100644
--- a/source/scripting/python/config.m4
+++ b/source/scripting/python/config.m4
@@ -54,9 +54,9 @@ fi
 
 if test x$PYTHON != x
 then
-	PYTHON_CFLAGS=`$PYTHON -c "from distutils import sysconfig; print '-I%s -I%s %s' % (sysconfig.get_python_inc(), sysconfig.get_python_inc(plat_specific=True), sysconfig.get_config_var('CFLAGS'))"`
-	PYTHON_LDFLAGS=`$PYTHON -c "from distutils import sysconfig; print '%s %s -lpython%s -L%s' % (sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('LIBPL'))"`
-	TRY_LINK_PYTHON($PYTHON_LDFLAGS, $PYTHON_CFLAGS)
+	DISTUTILS_CFLAGS=`$PYTHON -c "from distutils import sysconfig; print '-I%s -I%s %s' % (sysconfig.get_python_inc(), sysconfig.get_python_inc(plat_specific=True), sysconfig.get_config_var('CFLAGS'))"`
+	DISTUTILS_LDFLAGS=`$PYTHON -c "from distutils import sysconfig; print '%s %s -lpython%s -L%s' % (sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('LIBPL'))"`
+	TRY_LINK_PYTHON($DISTUTILS_LDFLAGS, $DISTUTILS_CFLAGS)
 fi
 
 SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])


-- 
Samba Shared Repository


More information about the samba-cvs mailing list