[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-491-g62d7635

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  62d76356c10b4223236425c4db32c2fc5105d155 (commit)
       via  59b62280d27a9e0a72241e4b60022be07e4cbce2 (commit)
       via  677179234ecaa6980dedc2bb6f77c525b56b532f (commit)
      from  69956a5597b0339b7c0ee3f394d649421f037f03 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 62d76356c10b4223236425c4db32c2fc5105d155
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Sep 9 23:49:07 2008 +0200

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

commit 59b62280d27a9e0a72241e4b60022be07e4cbce2
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 9 23:35:17 2008 +0200

    Attempt to correctly find python on host sunx

commit 677179234ecaa6980dedc2bb6f77c525b56b532f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Sep 9 21:56:57 2008 +0200

    Remove unused scripts for installing binaries.

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile                   |    7 +------
 source/script/installtorture.sh   |   18 ------------------
 source/script/uninstalltorture.sh |   15 ---------------
 source/scripting/python/config.m4 |    6 ++++++
 4 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100755 source/script/installtorture.sh
 delete mode 100755 source/script/uninstalltorture.sh


Changeset truncated at 500 lines:

diff --git a/source/Makefile b/source/Makefile
index f96a07a..66b0921 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -210,11 +210,7 @@ installdirs::
 		$(DESTDIR)$(PKGCONFIGDIR) \
 		$(DESTDIR)$(sysconfdir)
 
-installbin:: $(SBIN_PROGS) $(BIN_PROGS) $(TORTURE_PROGS) installdirs
-	@$(SHELL) $(srcdir)/script/installtorture.sh \
-		$(INSTALLPERMS) \
-		$(DESTDIR)$(TORTUREDIR) \
-		$(TORTURE_PROGS)
+installbin:: installdirs
 
 installplugins::
 
@@ -262,7 +258,6 @@ $(DESTDIR)$(sbindir)/%: bin/% installdirs
 	@chmod $(INSTALLPERMS) $@
 
 uninstallbin::
-	@$(SHELL) $(srcdir)/script/uninstalltorture.sh $(DESTDIR)$(TORTUREDIR) $(TORTURE_PROGS)
 
 uninstalllib::
 	@$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(libdir) $(SHARED_LIBS)
diff --git a/source/script/installtorture.sh b/source/script/installtorture.sh
deleted file mode 100755
index db7ad91..0000000
--- a/source/script/installtorture.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-INSTALLPERMS=$1
-TORTUREDIR=$2
-shift
-shift
-
-for p in $*; do
- p2=`dirname $p`
- base=`basename $p`
- DESTDIR=$TORTUREDIR/`basename $p2`
- mkdir -p $DESTDIR
- echo Installing $p as $DESTDIR/$base
- cp -f $p $DESTDIR/
- chmod $INSTALLPERMS $DESTDIR/$base
-done
-
-exit 0
diff --git a/source/script/uninstalltorture.sh b/source/script/uninstalltorture.sh
deleted file mode 100755
index 0c6e4ec..0000000
--- a/source/script/uninstalltorture.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-TORTUREDIR=$1
-shift
-shift
-
-for p in $*; do
- p2=`dirname $p`
- base=`basename $p`
- DESTDIR=$TORTUREDIR/`basename $p2`
- echo Removing $DESTDIR/$base
- rm -f $p $DESTDIR/
-done
-
-exit 0
diff --git a/source/scripting/python/config.m4 b/source/scripting/python/config.m4
index b599aae..af13b6a 100644
--- a/source/scripting/python/config.m4
+++ b/source/scripting/python/config.m4
@@ -50,6 +50,12 @@ 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
+		# 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


-- 
Samba Shared Repository