From 821ae54016df149c7d824d4014fea173e81fd71c Mon Sep 17 00:00:00 2001 From: Angel Ortega Date: Wed, 2 Jan 2008 17:02:27 +0100 Subject: [PATCH] Add mp_doccer detection to config.sh. --- config.sh | 15 +++++++++++++++ makefile.in | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 67ff168..8efb249 100755 --- a/config.sh +++ b/config.sh @@ -384,6 +384,21 @@ else echo "GRUTATXT=(echo '

' ; cat ; echo '

')" >> makefile.opts fi +# test for mp_doccer +echo -n "Testing if mp_doccer is installed... " +MP_DOCCER=$(which mp_doccer || which mp-doccer) + +if [ $? == 0 ] ; then + echo "OK" + echo "MP_DOCCER=${MP_DOCCER}" >> makefile.opts +else + echo "No" + echo + echo "mp_doccer not found; some documentation will not be generated." + echo "You can take it from http://www.triptico.com/software/mp_doccer.html" + echo "MP_DOCCER=echo" >> makefile.opts +fi + if [ "$WITH_NULL_HASH" = "1" ] ; then echo "Selecting NULL hash function" diff --git a/makefile.in b/makefile.in index 61555f7..9a6e7c6 100644 --- a/makefile.in +++ b/makefile.in @@ -36,7 +36,7 @@ stress: stress.c $(LIB) $(GRUTATXT) < $< > $@ doc/mpdm_api.html: mpdm_*.c - -mp_doccer mpdm_*.c -o doc/mpdm_api -f html1 \ + $(MP_DOCCER) mpdm_*.c -o doc/mpdm_api -f html1 \ -t "MPDM C API ($(VERSION))" \ -a 'Angel Ortega - angel@triptico.com' -- 2.11.4.GIT