summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-13 14:59:16 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-01-13 14:59:16 +0100
commitecf52b2bc7c55fdc574f8dc58e90a9f52bdf1925 (patch)
treef73cc3a280b9ea1f650f2f22e3c42519f841a450 /source4/scripting/python
parent6ef36c1f82fa9d48a3418f25202cab55b2f54d2f (diff)
downloadsamba-ecf52b2bc7c55fdc574f8dc58e90a9f52bdf1925.tar.gz
samba-ecf52b2bc7c55fdc574f8dc58e90a9f52bdf1925.tar.bz2
samba-ecf52b2bc7c55fdc574f8dc58e90a9f52bdf1925.zip
python: Avoid overwriting flags for already found version of Python.
(This used to be commit 9041e385fe666c16d9a5b9a030b54a856f17e5e5)
Diffstat (limited to 'source4/scripting/python')
-rw-r--r--source4/scripting/python/config.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index b0884478c1..4f46f92682 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/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])