diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-05-01 20:01:37 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-05-01 22:49:11 +0200 |
| commit | 9d26d7e63d1db8d92e357201814a12899921fff7 (patch) | |
| tree | a7b42e97a39fb6bb5db3d6ddac37320c5cc180b9 | |
| parent | 29e696a62be05532783fb6e674abe2af63fb13b7 (diff) | |
| download | samba-9d26d7e63d1db8d92e357201814a12899921fff7.tar.gz samba-9d26d7e63d1db8d92e357201814a12899921fff7.tar.bz2 samba-9d26d7e63d1db8d92e357201814a12899921fff7.zip | |
Remove references to dia now that we use inkscape for diagrams.
| -rw-r--r-- | docs-xml/Makefile.settings.in | 1 | ||||
| -rw-r--r-- | docs-xml/configure.ac | 20 |
2 files changed, 0 insertions, 21 deletions
diff --git a/docs-xml/Makefile.settings.in b/docs-xml/Makefile.settings.in index 0bc4ab9bbf..de708f6c65 100644 --- a/docs-xml/Makefile.settings.in +++ b/docs-xml/Makefile.settings.in @@ -4,7 +4,6 @@ XMLLINT = @XMLLINT@ PNGTOPNM = @PNGTOPNM@ EPSTOPNM = @EPSTOPNM@ PNMTOPNG = @PNMTOPNG@ -DIA = @DIA@ INKSCAPE = @INKSCAPE@ PNMTOPS = @PNMTOPS@ HTML2TEXT = @HTML2TEXT@ diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac index b4a061a1f5..65878d391b 100644 --- a/docs-xml/configure.ac +++ b/docs-xml/configure.ac @@ -11,11 +11,6 @@ AC_SUBST(DOC_BUILD_DATE) DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL) DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL) -dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTML) -dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTMLHELP) -dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PEARSON) -dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PLUCKER) -dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, FOPDF) DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, LATEX) DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PS) DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PDF) @@ -24,21 +19,6 @@ DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, HTMLHELP) DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PEARSON) DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PLUCKER) DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, FOPDF) -# Check dia version number - -#if test -n "$DIA"; then -# [ DIA_VERSION=`$DIA -v | egrep -o '([0-9]+)\.([0-9]+)'`] -# DIA_MAJ_VERSION=`echo $DIA_VERSION | cut -d . -f 1` -# DIA_MIN_VERSION=`echo $DIA_VERSION | cut -d . -f 2` - -# if test "$DIA_MAJ_VERSION" -le "0" -# then -# if test "$DIA_MIN_VERSION" -le "92" && test -z "$DISPLAY" -# then -# AC_MSG_ERROR([Dia below 0.93 requires an X environment. Set \$DISPLAY or install Dia 0.93 or higher]) -# fi -# fi -#fi DOCS_TARGET_REQUIRE_PROGRAM(EPSTOPDF, epstopdf, PDF) DOCS_TARGET_REQUIRE_PROGRAM(PNGTOPNM, pngtopnm, PS) |