diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 3a6751e..d9c2581 100644 --- a/configure.ac +++ b/configure.ac @@ -60,22 +60,22 @@ AC_CHECK_FUNCS([gettimeofday]) AC_CHECK_PROG([has_doxygen], [doxygen], [yes], [no]) AC_CHECK_PROG([has_valgrind], [valgrind], [yes], [no]) -AC_ARG_ENABLE([doxygen], AS_HELP_STRING([--disable-doxygen], [Disable the generation of documents with doxygen]), [], [enable_doxygen="yes"]) -AC_ARG_ENABLE([valgrind], AS_HELP_STRING([--disable-valgrind], [Disable the use of valgrind in tests]), [], [enable_valgrind="yes"]) +AC_ARG_WITH([doxygen], AS_HELP_STRING([--without-doxygen], [Disable the generation of documents with doxygen]), [], [with_doxygen="yes"]) +AC_ARG_WITH([valgrind], AS_HELP_STRING([--without-valgrind], [Disable the use of valgrind in tests]), [], [with_valgrind="yes"]) AC_ARG_ENABLE([examples], AS_HELP_STRING([--disable-examples], [Disable all examples]), [], [enable_examples="yes"]) AC_ARG_ENABLE([tests], AS_HELP_STRING([--disable-tests], [Disable all tests]), [], [enable_tests="yes"]) AC_ARG_ENABLE([itc-test], AS_HELP_STRING([--disable-itc-test], [Disable ITC test]), [], [enable_itc_test="yes"]) AC_ARG_ENABLE([tuberia-test], AS_HELP_STRING([--disable-tuberia-test], [Disable Tuberia test]), [], [enable_tuberia_test="yes"]) -AS_VAR_IF([has_doxygen], [no], [AS_VAR_SET([enable_doxygen], [no])], []) -AS_VAR_IF([has_valgrind], [no], [AS_VAR_SET([enable_valgrind], [no])], []) +AS_VAR_IF([has_doxygen], [no], [AS_VAR_SET([with_doxygen], [no])], []) +AS_VAR_IF([has_valgrind], [no], [AS_VAR_SET([with_valgrind], [no])], []) AS_VAR_IF([has_avcodec], [no], [AS_VAR_SET([has_ffmpeg], [no])], []) AS_VAR_IF([has_avformat], [no], [AS_VAR_SET([has_ffmpeg], [no])], []) AS_VAR_IF([has_avutil], [no], [AS_VAR_SET([has_ffmpeg], [no])], []) AS_VAR_IF([has_swscale], [no], [AS_VAR_SET([has_ffmpeg], [no])], []) -AM_CONDITIONAL([DOXYGEN], [test x$enable_doxygen = xyes]) -AM_CONDITIONAL([VALGRIND], [test x$enable_valgrind = xyes]) +AM_CONDITIONAL([DOXYGEN], [test x$with_doxygen = xyes]) +AM_CONDITIONAL([VALGRIND], [test x$with_valgrind = xyes]) AM_CONDITIONAL([EXAMPLES], [test x$enable_examples = xyes]) AM_CONDITIONAL([HAS_FFMPEG], [test x$has_ffmpeg = xyes]) AM_CONDITIONAL([TESTS], [test x$enable_tests = xyes]) @@ -98,8 +98,8 @@ AC_MSG_NOTICE([has avformat: $has_avformat]) AC_MSG_NOTICE([has avutil: $has_avutil]) AC_MSG_NOTICE([has swscale: $has_swscale]) AC_MSG_NOTICE([has ffmpeg: $has_ffmpeg]) -AC_MSG_NOTICE([enable doxygen: $enable_doxygen]) -AC_MSG_NOTICE([enable valgrind: $enable_valgrind]) +AC_MSG_NOTICE([with doxygen: $with_doxygen]) +AC_MSG_NOTICE([with valgrind: $with_valgrind]) AC_MSG_NOTICE([enable examples: $enable_examples]) AC_MSG_NOTICE([enable tests: $enable_tests]) AC_MSG_NOTICE([enable itc tests: $enable_itc_test]) |