From 899cdab190666d07026a050d55f364bd8c4481db Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 28 Aug 2007 18:30:53 +0000 Subject: Make use of AM_PATH_PYTHON to get python variables. Fixes bug #470642 2007-08-24 Xavier Claessens * python/pyempathy/Makefile.am: * python/pyempathygtk/Makefile.am: * configure.ac: Make use of AM_PATH_PYTHON to get python variables. Fixes bug #470642 (Daniel Gryniewicz). svn path=/trunk/; revision=278 --- ChangeLog | 7 +++++++ configure.ac | 7 ++++++- python/pyempathy/Makefile.am | 2 +- python/pyempathygtk/Makefile.am | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d7502fc5..fdb0c4d9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-08-24 Xavier Claessens + + * python/pyempathy/Makefile.am: + * python/pyempathygtk/Makefile.am: + * configure.ac: Make use of AM_PATH_PYTHON to get python variables. + Fixes bug #470642 (Daniel Gryniewicz). + 2007-08-24 Xavier Claessens * configure.ac: Bump version to 0.13. diff --git a/configure.ac b/configure.ac index 761b7f964..c31afd82c 100644 --- a/configure.ac +++ b/configure.ac @@ -177,7 +177,12 @@ if test "x$have_python" = "xno"; then enable_python="no (missing dependencies)" else if test "x$enable_python" != "xno"; then - enable_python="yes" + AM_PATH_PYTHON + if test -z "$PYTHON" ; then + enable_python="no" + else + enable_python="yes" + fi else enable_python="no (disabled)" fi diff --git a/python/pyempathy/Makefile.am b/python/pyempathy/Makefile.am index 4778fdf20..c11eedbc3 100644 --- a/python/pyempathy/Makefile.am +++ b/python/pyempathy/Makefile.am @@ -12,7 +12,7 @@ AM_CPPFLAGS = \ BUILT_SOURCES = \ pyempathy.c -pyempathydir = $(prefix)/lib/`pyversions -d`/site-packages +pyempathydir = $(pyexecdir) pyempathy_LTLIBRARIES = empathy.la empathy_la_SOURCES = \ diff --git a/python/pyempathygtk/Makefile.am b/python/pyempathygtk/Makefile.am index f7338654e..04aa5762f 100644 --- a/python/pyempathygtk/Makefile.am +++ b/python/pyempathygtk/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ BUILT_SOURCES = \ pyempathygtk.c -pyempathygtkdir = $(prefix)/lib/`pyversions -d`/site-packages +pyempathygtkdir = $(pyexecdir) pyempathygtk_LTLIBRARIES = empathygtk.la empathygtk_la_SOURCES = \ -- cgit v1.2.3