From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Wed, 7 Feb 2007 21:35:07 +0000 (+0000)
Subject: use setup.py for python install and build work instad of trying todo it on our own
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e9031dee4fcf7719ebf869e377d389a45e0c37d1;p=rrdtool-all.git

use setup.py for python install and build work instad of trying todo it on our own


git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@993 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/program/Makefile.am b/program/Makefile.am
index 0fa53a37..1ed16705 100644
--- a/program/Makefile.am
+++ b/program/Makefile.am
@@ -45,6 +45,6 @@ site-tcl-install: all
 	cd bindings/tcl && $(MAKE) tcl-install
 
 site-python-install: all
-	cd bindings/python && $(MAKE) python-install
+	cd bindings/python && $(PYTHON) setup.py install
 
 ##END##
diff --git a/program/configure.ac b/program/configure.ac
index ca95a1b8..19fae7be 100644
--- a/program/configure.ac
+++ b/program/configure.ac
@@ -504,6 +504,7 @@ else
 
 fi
 
+
 AC_MSG_CHECKING(Ruby Modules to build)
 AC_MSG_RESULT(${COMP_RUBY:-No Ruby Modules will be built})
 
@@ -583,7 +584,13 @@ AM_PATH_PYTHON(2.3,[],[enable_python=no])
 AM_CHECK_PYTHON_HEADERS(,[enable_python=no;AC_MSG_WARN(could not find Python headers)])
 fi
 
-AM_CONDITIONAL(BUILD_PYTHON,[test "$enable_python" = "yes"])
+if test  x$enable_python = xno; then
+	COMP_PYTHON=
+else
+	COMP_PYTHON="python"
+fi
+
+AC_SUBST(COMP_PYTHON)
 
 dnl Check for nroff
 AC_PATH_PROGS(NROFF, gnroff nroff)