diff options
| author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2016-07-18 18:46:03 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2016-07-18 18:46:03 +0200 |
| commit | c9f141ece7242ac747eb14ca2bb74bbf143c7612 (patch) | |
| tree | 8050935de30608413c5ac843502dbf236a158366 | |
| parent | 06684777d5e17ba34150e67e787c04af59f1bed5 (diff) | |
| download | sigc++-libsigc++-2-8.tar.gz | |
Build: Fix silent buildslibsigc++-2-8
* configure.ac: Pass yes to AM_SILENT_RULES, thus enabling silent builds.
Replace MM_AX_CXX_COMPILE_STDCXX_11 by MM_AX_CXX_COMPILE_STDCXX (not necessary
for silent builds).
* docs/reference/Doxyfile.in: Set QUIET=YES.
Update for doxygen 1.8.11 (not necessary for silent builds).
Bug #768797
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | docs/reference/Doxyfile.in | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 4ca1da9..1fc668c 100644 --- a/configure.ac +++ b/configure.ac @@ -26,16 +26,18 @@ AC_CONFIG_MACRO_DIR([build]) AC_CONFIG_HEADERS([config.h sigc++config.h]) AM_INIT_AUTOMAKE([1.9 -Wno-portability check-news dist-bzip2 no-define nostdinc tar-ustar]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) +# Support silent build rules. +# Disable by either passing --disable-silent-rules to configure or passing V=1 to make. +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_MAINTAINER_MODE AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>]) -MM_PREREQ([0.9.8]) +MM_PREREQ([0.9.10]) MM_INIT_MODULE([sigc++-2.0]) MM_CONFIG_DOCTOOL_DIR([docs]) AC_PROG_CXX -MM_AX_CXX_COMPILE_STDCXX_11([noext],[mandatory]) +MM_AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) AC_DISABLE_STATIC LT_INIT([win32-dll]) diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in index 3909fac..c94b485 100644 --- a/docs/reference/Doxyfile.in +++ b/docs/reference/Doxyfile.in @@ -1,4 +1,4 @@ -# Doxyfile 1.8.9.1 +# Doxyfile 1.8.11 # @configure_input@ #--------------------------------------------------------------------------- @@ -45,6 +45,7 @@ CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO IDL_PROPERTY_SUPPORT = YES DISTRIBUTE_GROUP_DOC = NO +GROUP_NESTED_COMPOUNDS = NO SUBGROUPING = YES INLINE_GROUPED_CLASSES = NO INLINE_SIMPLE_STRUCTS = NO @@ -93,11 +94,12 @@ CITE_BIB_FILES = #--------------------------------------------------------------------------- # Configuration options related to warning and progress messages #--------------------------------------------------------------------------- -QUIET = NO +QUIET = YES WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO +WARN_AS_ERROR = NO WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = reference/doxygen.log #--------------------------------------------------------------------------- @@ -140,6 +142,8 @@ REFERENCES_LINK_SOURCE = YES SOURCE_TOOLTIPS = YES USE_HTAGS = NO VERBATIM_HEADERS = NO +CLANG_ASSISTED_PARSING = NO +CLANG_OPTIONS = #--------------------------------------------------------------------------- # Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- @@ -224,6 +228,7 @@ LATEX_BATCHMODE = NO LATEX_HIDE_INDICES = NO LATEX_SOURCE_CODE = NO LATEX_BIB_STYLE = plain +LATEX_TIMESTAMP = NO #--------------------------------------------------------------------------- # Configuration options related to the RTF output #--------------------------------------------------------------------------- @@ -281,7 +286,7 @@ PREDEFINED = __cplusplus \ SIGC_CONFIGURE \ SIGC_GCC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD \ SIGC_MSVC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD \ - SIGC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD" + SIGC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD EXPAND_AS_DEFINED = SIGC_WORKAROUND_OPERATOR_PARENTHESES \ SIGCXX_MAJOR_VERSION \ SIGCXX_MINOR_VERSION \ |