interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #30 from johndickinson/issue_29 

Issue 29 - fixed the detection of doxygen
This commit is contained in:
wtoorop 2014-05-07 15:55:43 +02:00
parent ba3b0bfaab 175ff65623
commit 776fe3c02a
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored
View File

@ -11049,20 +11049,22 @@ fi
set dummy doxygen; ac_word=$2 set dummy doxygen; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; } $as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_DOXYGEN+:} false; then : if ${ac_cv_path_DOXYGEN+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
if test -n "$DOXYGEN"; then case $DOXYGEN in
ac_cv_prog_DOXYGEN="$DOXYGEN" # Let the user override the test. [\\/]* | ?:[\\/]*)
else ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH for as_dir in $PATH
do do
IFS=$as_save_IFS IFS=$as_save_IFS
test -z "$as_dir" && as_dir=. test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_DOXYGEN="" ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2 break 2
fi fi
@ -11070,9 +11072,10 @@ done
done done
IFS=$as_save_IFS IFS=$as_save_IFS
;;
esac
fi fi
fi DOXYGEN=$ac_cv_path_DOXYGEN
DOXYGEN=$ac_cv_prog_DOXYGEN
if test -n "$DOXYGEN"; then if test -n "$DOXYGEN"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
$as_echo "$DOXYGEN" >&6; } $as_echo "$DOXYGEN" >&6; }

2
configure.ac
View File

@ -175,7 +175,7 @@ then
AC_MSG_ERROR([libunbound is missing.]) AC_MSG_ERROR([libunbound is missing.])
fi fi
AC_CHECK_PROG([DOXYGEN], [doxygen]) AC_PATH_PROG([DOXYGEN], [doxygen])
if test -z "$DOXYGEN"; if test -z "$DOXYGEN";
then AC_MSG_WARN([doxygen not found, continuing without]) then AC_MSG_WARN([doxygen not found, continuing without])
fi fi