if doxygen is missing no longer fail make in doc dir

This commit is contained in:
Glen Wiley 2014-03-06 12:14:19 -05:00
parent 6d661193e7
commit e0e85b8b3e
2 changed files with 7 additions and 11 deletions

15
configure vendored
View File

@ -11045,10 +11045,8 @@ then
as_fn_error $? "libunbound is missing." "$LINENO" 5
fi
for ac_prog in doxygen
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
# Extract the first word of "doxygen", so it can be a program name with args.
set dummy doxygen; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_DOXYGEN+:} false; then :
@ -11064,7 +11062,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DOXYGEN="$ac_prog"
ac_cv_prog_DOXYGEN=""
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@ -11084,12 +11082,9 @@ $as_echo "no" >&6; }
fi
test -n "$DOXYGEN" && break
done
if test -z "$DOXYGEN";
then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Doxygen not found, continuing without" >&5
$as_echo "$as_me: WARNING: Doxygen not found, continuing without" >&2;}
then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found, continuing without" >&5
$as_echo "$as_me: WARNING: doxygen not found, continuing without" >&2;}
fi
# Checks for header files.

View File

@ -44,6 +44,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
EDITS=-e 's/@''version@/$(version)/g'
DOXYGEN = @DOXYGEN@
DOCDIRS = html latex man
MANPAGES3 = libgetdns.3 getdns_address.3 getdns_cancel_callback.3 getdns_context.3 getdns_context_create.3 getdns_context_set.3 getdns_convert.3 getdns_dict.3 getdns_dict_get.3 getdns_dict_set.3 getdns_free_sync_request_memory.3 getdns_general.3 getdns_hostname.3 getdns_list.3 getdns_list_get.3 getdns_list_set.3 getdns_service.3
@ -53,7 +54,7 @@ default: all
all: doc
doc: $(MANPAGES3)
cd ../src && doxygen
if test x_$(DOXYGEN) != x_ ; then cd ../src; doxygen; fi
.SUFFIXES: .3.in .3
.3.in.3: