Checks for libXpm

Check if PYTHON variable have some value; if not, skip documentation building
Let documentation contains full ede version
This commit is contained in:
Sanel Zukan 2009-01-14 15:41:49 +00:00
parent 61c78af89c
commit a79711dfbd
2 changed files with 14 additions and 3 deletions

View File

@ -21,7 +21,12 @@ MANUALICONS = "images" ;
rule EdeManual rule EdeManual
{ {
if ! $(ASCIIDOC) { 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 ; return ;
} }
@ -94,13 +99,13 @@ rule EdeManualWithToc
actions AsciiDoc1 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) # version with tidy (utility to clean HTML/XHTML code)
actions AsciiDoc2 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" > "$(<)" $(TIDY) -q -i "$(<).tmp" > "$(<)"
$(RM) "$(<).tmp" $(RM) "$(<).tmp"
} }

View File

@ -147,6 +147,12 @@ else
AC_MSG_ERROR([You don't have eFLTK installed. To compile EDE, you will need it.]) AC_MSG_ERROR([You don't have eFLTK installed. To compile EDE, you will need it.])
fi 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 EDE_INIT_JAM
AC_SUBST(EDE_VERSION) AC_SUBST(EDE_VERSION)