diff --git a/configure b/configure
index 00848b45..c99c7fe9 100755
--- a/configure
+++ b/configure
@@ -11049,20 +11049,22 @@ fi
 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 :
+if ${ac_cv_path_DOXYGEN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$DOXYGEN"; then
-  ac_cv_prog_DOXYGEN="$DOXYGEN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $DOXYGEN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   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_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
     break 2
   fi
@@ -11070,9 +11072,10 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-DOXYGEN=$ac_cv_prog_DOXYGEN
+DOXYGEN=$ac_cv_path_DOXYGEN
 if test -n "$DOXYGEN"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
 $as_echo "$DOXYGEN" >&6; }
diff --git a/configure.ac b/configure.ac
index 88ac07d2..f22bc8a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,7 +175,7 @@ then
     AC_MSG_ERROR([libunbound is missing.])
 fi
 
-AC_CHECK_PROG([DOXYGEN], [doxygen])
+AC_PATH_PROG([DOXYGEN], [doxygen])
 if test -z "$DOXYGEN";
     then AC_MSG_WARN([doxygen not found, continuing without])
 fi