diff --git a/configure b/configure
index b5696ff..5ddf0c6 100755
--- a/configure
+++ b/configure
@@ -770,6 +770,7 @@ with_aix_soname
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+with_doxygen
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1441,6 +1442,7 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
+  --with-doxygen          create doxygen documentation
 
 Some influential environment variables:
   CC          C compiler command
@@ -13273,7 +13275,17 @@ ac_config_files="$ac_config_files Makefile src/Makefile utils/Makefile examples/
 
 
 
-for ac_prog in doxygen
+# Check whether --with-doxygen was given.
+if test "${with_doxygen+set}" = set; then :
+  withval=$with_doxygen; with_doxygen="$withval"
+else
+  with_doxygen=yes
+fi
+
+
+if test "x$with_doxygen" != xno; then :
+
+	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
@@ -13315,9 +13327,7 @@ fi
   test -n "$DOXYGEN" && break
 done
 
-if test -z "$DOXYGEN";
-	then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Doxygen not found - continuing without Doxygen support" >&5
-$as_echo "$as_me: WARNING: Doxygen not found - continuing without Doxygen support" >&2;}
+
 fi
 
  if test -n "$DOXYGEN"; then
@@ -13328,6 +13338,10 @@ else
   HAVE_DOXYGEN_FALSE=
 fi
 
+if test -z "$DOXYGEN"; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Doxygen not found - continuing without Doxygen support" >&5
+$as_echo "$as_me: WARNING: Doxygen not found - continuing without Doxygen support" >&2;}
+fi
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure