summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-09 23:49:07 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-09 23:49:07 +0200
commit4f266dff13d2937b1800954a9ddb536df4d14a5f (patch)
tree9151ffc9825c472e57a8e3d629d835949a66c65c /source4/scripting
parent1d8973a82eda362d19dbfe79529d10baf6f97d9d (diff)
downloadsamba-4f266dff13d2937b1800954a9ddb536df4d14a5f.tar.gz
samba-4f266dff13d2937b1800954a9ddb536df4d14a5f.tar.bz2
samba-4f266dff13d2937b1800954a9ddb536df4d14a5f.zip
Only try with -LPYTHONDIR/lib when python-config output didn't work.
(This used to be commit 62d76356c10b4223236425c4db32c2fc5105d155)
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/config.m411
1 files changed, 8 insertions, 3 deletions
diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 5607accb7c..af13b6ae69 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -48,9 +48,14 @@ fi
if test -z "$PYTHON_CONFIG"; then
AC_MSG_WARN([No python-config found])
else
- base=`$PYTHON_CONFIG --prefix`
- TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
- TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
+ TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
+ TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
+ if x$working_python = xno; then
+ # It seems the library path isn't included on some systems
+ base=`$PYTHON_CONFIG --prefix`
+ TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
+ TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
+ fi
fi
if test x$PYTHON != x