2002-08-18 Theodore A. Roth * config/avr_doc_pdf.m4: Check ac_has_pdftex before building pdf docs. * config/check_texinfo.m4: Make pdftex check separate. Index: config/avr_doc_pdf.m4 =================================================================== RCS file: /cvsroot/simulavr/simulavr/config/avr_doc_pdf.m4,v retrieving revision 1.2 diff -u -r1.2 avr_doc_pdf.m4 --- config/avr_doc_pdf.m4 5 Feb 2002 17:17:56 -0000 1.2 +++ config/avr_doc_pdf.m4 19 Aug 2002 06:09:35 -0000 @@ -17,9 +17,13 @@ AC_ARG_ENABLE(pdf, [ --enable-pdf enable generation of the documentation in pdf format], if test "$enable_pdf" == "yes"; then - AC_MSG_RESULT(yes) - TARGET_PDF=pdf - INSTALL_PDF=install-pdf + if test "$ac_has_pdftex" == "yes"; then + AC_MSG_RESULT(yes) + TARGET_PDF=pdf + INSTALL_PDF=install-pdf + else + AC_MSG_RESULT([no: can't build without pdftex]) + fi else AC_MSG_RESULT(no) fi Index: config/check_texinfo.m4 =================================================================== RCS file: /cvsroot/simulavr/simulavr/config/check_texinfo.m4,v retrieving revision 1.2 diff -u -r1.2 check_texinfo.m4 --- config/check_texinfo.m4 9 Jan 2002 20:06:15 -0000 1.2 +++ config/check_texinfo.m4 19 Aug 2002 06:09:35 -0000 @@ -27,9 +27,8 @@ dnl Checks for some programs in the tetex package. if test -n "$ac_doc_subdir"; then AC_CHECK_PROG(has_tex, tex, "yes") - AC_CHECK_PROG(has_pdftex, pdftex, "yes") AC_CHECK_PROG(has_texi2html, texi2html, "yes") - if test -z "$has_tex" || test -z "$has_pdftex" || test -z "$has_texi2html"; then + if test -z "$has_tex" || test -z "$has_texi2html"; then ac_doc_subdir="" AC_MSG_WARN([ ]) AC_MSG_WARN([You do not seem to have tetex installed on your system.]) @@ -51,4 +50,17 @@ fi fi AC_SUBST([ac_doc_subdir]) +dnl +dnl Some minimal installs of tetex don't supply the pdf stuff, so check that separately +if test -n "$ac_doc_subdir"; then + AC_CHECK_PROG(ac_has_pdftex, pdftex, "yes") + if test -z "$ac_has_pdftex"; then + AC_MSG_WARN([ ]) + AC_MSG_WARN([Your system doesn't seem to have pdftex installed.]) + AC_MSG_WARN([Without pdftex you can not build the pdf version of the]) + AC_MSG_WARN([documentation.]) + AC_MSG_WARN([ ]) + fi +fi +AC_SUBST([ac_has_pdftex]) ])