summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5874ea5)
raw | patch | inline | side by side (parent: 5874ea5)
author | oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
Mon, 16 May 2005 20:04:42 +0000 (20:04 +0000) | ||
committer | oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa> | |
Mon, 16 May 2005 20:04:42 +0000 (20:04 +0000) |
git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@569 a5681a0c-68f1-0310-ab6d-d61299d08faa
bindings/Makefile.am | patch | blob | history | |
configure.ac | patch | blob | history |
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 57773b70b534d6e255f582e34701819ecc06eec6..f1af1c52759eb640b01b2712ff24f58c7560aad3 100644 (file)
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
-SUBDIRS = tcl python
+SUBDIRS = tcl @PYTHON_DIR@
# the following files are not mentioned in any other Makefile
EXTRA_DIST = perl-piped/MANIFEST perl-piped/README perl-piped/Makefile.PL perl-piped/RRDp.pm perl-piped/t/base.t \
perl-shared/ntmake.pl perl-shared/MANIFEST perl-shared/README perl-shared/Makefile.PL perl-shared/RRDs.pm perl-shared/RRDs.xs perl-shared/t/base.t
diff --git a/configure.ac b/configure.ac
index 243465e2b8519855530e883ce5441cd6e6364277..bab55cbf50fac953ff8225f30944f48028a73e81 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_SUBST(TCL_LD_SEARCH_FLAGS)
dnl Check for python
-AM_PATH_PYTHON(2.3)
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-
+AM_PATH_PYTHON(2.3,[PYTHON_DIR=python],[PYTHON_DIR=''])
+AM_CHECK_PYTHON_HEADERS(,[PYTHON_DIR='';AC_MSG_WARN(could not find Python headers)])
+AC_SUBST(PYTHON_DIR)
dnl Check for nroff