From a79711dfbd4b24e2db5ec39240b1e157cbb854e1 Mon Sep 17 00:00:00 2001
From: Sanel Zukan <karijes@users.sf.net>
Date: Wed, 14 Jan 2009 15:41:49 +0000
Subject: [PATCH] Checks for libXpm Check if PYTHON variable have some value;
 if not, skip documentation building Let documentation contains full ede
 version

---
 build/Doc.jam | 11 ++++++++---
 configure.in  |  6 ++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/build/Doc.jam b/build/Doc.jam
index 636c92a..ca88db5 100644
--- a/build/Doc.jam
+++ b/build/Doc.jam
@@ -21,7 +21,12 @@ MANUALICONS = "images" ;
 rule EdeManual
 {
 	if ! $(ASCIIDOC) {
-		Echo "ASCIIDOC not defined; documentation will not be built !" ;
+		Echo "ASCIIDOC not defined; documentation will not be built!" ;
+		return ;
+	}
+
+	if ! $(PYTHON) {
+		Echo "PYTHON not defined. This means python was not found on your system. Documentation will not be build!" ;
 		return ;
 	}
 
@@ -94,13 +99,13 @@ rule EdeManualWithToc
 
 actions AsciiDoc1
 {
-	$(ASCIIDOC) $(TOC_FLAG) -a icons -a iconsdir=$(MANUALICONS) -a edeversion="EDE 2.0" -o $(<) $(>)
+	$(ASCIIDOC) $(TOC_FLAG) -a icons -a iconsdir=$(MANUALICONS) -a edeversion="EDE $(EDE_VERSION)" -o $(<) $(>)
 }
 
 # version with tidy (utility to clean HTML/XHTML code)
 actions AsciiDoc2
 {
-	$(ASCIIDOC) $(TOC_FLAG) -a icons -a iconsdir=$(MANUALICONS) -a edeversion="EDE 2.0" -o "$(<).tmp" $(>)
+	$(ASCIIDOC) $(TOC_FLAG) -a icons -a iconsdir=$(MANUALICONS) -a edeversion="EDE $(EDE_VERSION)" -o "$(<).tmp" $(>)
 	$(TIDY) -q -i "$(<).tmp" > "$(<)"
 	$(RM) "$(<).tmp"
 }
diff --git a/configure.in b/configure.in
index cbba071..8ab569e 100644
--- a/configure.in
+++ b/configure.in
@@ -147,6 +147,12 @@ else
 	AC_MSG_ERROR([You don't have eFLTK installed. To compile EDE, you will need it.])
 fi
 
+EDE_CHECK_LIBXPM
+if test "$have_libxpm" = "yes"; then
+	FLTK_LIBS="$FLTK_LIBS $LIBXPM_LIBS"
+	FLTK_LIBS_NOIMAGES="$FLTK_LIBS_NOIMAGES $LIBXPM_LIBS"
+fi
+
 EDE_INIT_JAM
 
 AC_SUBST(EDE_VERSION)