trying to fix #88412 by bypassing all the python subdir if python ain't
* Makefile.am configure.in: trying to fix #88412 by bypassing
all the python subdir if python ain't detected
daniel
diff --git a/ChangeLog b/ChangeLog
index 954f831..197c003 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 20 14:00:16 CEST 2002 Daniel Veillard <daniel@veillard.com>
+
+ * Makefile.am configure.in: trying to fix #88412 by bypassing
+ all the python subdir if python ain't detected
+
Thu Sep 19 21:46:53 CEST 2002 Daniel Veillard <daniel@veillard.com>
* Makefile.am configure.in include/libxml/xmlversion.h.in:
diff --git a/Makefile.am b/Makefile.am
index 7269a9e..a3edb29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
# AUTOMAKE_ OPTIONS=no-dependencies
-SUBDIRS = include . doc example python
+SUBDIRS = include . doc example @PYTHON_SUBDIR@
INCLUDES = -I@srcdir@/include -I$(top_builddir)/include @THREAD_CFLAGS@ @Z_CFLAGS@
@@ -107,7 +107,7 @@
testall : tests SVGtests SAXtests
tests: XMLtests XMLenttests HTMLtests Validtests URItests XPathtests XPtrtests XIncludetests C14Ntests Scripttests Catatests @TEST_REGEXPS@ @TEST_SCHEMAS@ @TEST_THREADS@
- @(cd python ; $(MAKE) tests)
+ @(if [ "@PYTHON_SUBDIR@" != "" ] ; then cd python ; $(MAKE) tests ; fi)
valgrind:
@echo '## Running the regression tests under Valgrind'
diff --git a/configure.in b/configure.in
index 26268f7..3939e8c 100644
--- a/configure.in
+++ b/configure.in
@@ -248,6 +248,13 @@
fi
fi
AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
+if test "$PYTHON_INCLUDES" != ""
+then
+ PYTHON_SUBDIR=python
+else
+ PYTHON_SUBDIR=
+fi
+AC_SUBST(PYTHON_SUBDIR)
dnl
dnl Tester makes use of readline if present