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/program@993 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/Makefile.am b/Makefile.am
index 0fa53a3..1ed1670 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,6 +45,6 @@ site-tcl-install: all
        cd bindings/tcl && $(MAKE) tcl-install
 
 site-python-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##
 
 ##END##

diff --git a/configure.ac b/configure.ac
index ca95a1b..19fae7b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -504,6 +504,7 @@ else
 
 fi
 
 
 fi
 

+

 AC_MSG_CHECKING(Ruby Modules to build)
 AC_MSG_RESULT(${COMP_RUBY:-No Ruby Modules will be built})
 
 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_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)
 
 dnl Check for nroff
 AC_PATH_PROGS(NROFF, gnroff nroff)