if python stuff does not work, do not die, just do not compile python
authoroetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Mon, 16 May 2005 20:04:42 +0000 (20:04 +0000)
committeroetiker <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
configure.ac

index 57773b7..f1af1c5 100644 (file)
@@ -1,4 +1,4 @@
-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
 # 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
index 243465e..bab55cb 100644 (file)
@@ -390,9 +390,9 @@ AC_SUBST(TCL_PACKAGE_PATH)
 AC_SUBST(TCL_LD_SEARCH_FLAGS)
 
 dnl Check for python
 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
 
 
 dnl Check for nroff