Only try with -LPYTHONDIR/lib when python-config output didn't work.

[ira/wip.git] / source4 / scripting / python / config.m4

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 5607accb7c2481812e1deaf8a6e90cc0ab08b828..af13b6ae6947f7fae103c477316ce54c6157b011 100644 (file)
--- 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