diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 20:29:05 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 20:29:05 +0200 |
| commit | 729ffbae086309992d7433a296fca64f6800f8fa (patch) | |
| tree | 6c133d2b91ab9313da11bf8bad15f497e1b5c61f /source4/scripting | |
| parent | 88ad1a936ccd2451d6dbf542a0a746ad71a3e968 (diff) | |
| parent | fc7050e54c69919d754ca0adf3f2f741a501fec4 (diff) | |
| download | samba-729ffbae086309992d7433a296fca64f6800f8fa.tar.gz samba-729ffbae086309992d7433a296fca64f6800f8fa.tar.xz samba-729ffbae086309992d7433a296fca64f6800f8fa.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Conflicts:
source4/main.mk
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/config.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4 index af13b6ae694..aaf32c5e4e7 100644 --- a/source4/scripting/python/config.m4 +++ b/source4/scripting/python/config.m4 @@ -50,7 +50,7 @@ if test -z "$PYTHON_CONFIG"; then else TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`]) TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`]) - if x$working_python = xno; then + if test 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`]) |