From 4f266dff13d2937b1800954a9ddb536df4d14a5f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 9 Sep 2008 23:49:07 +0200
Subject: Only try with -LPYTHONDIR/lib when python-config output didn't work.
 (This used to be commit 62d76356c10b4223236425c4db32c2fc5105d155)

---
 source4/scripting/python/config.m4 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'source4/scripting/python/config.m4')

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
-- 
cgit