Skip to content

Commit 3d26a7b

Browse files
author
Kjell Ahlstedt
committed
Build: Fix silent builds
* 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
1 parent d75d8ec commit 3d26a7b

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

configure.ac

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ AC_CONFIG_MACRO_DIR([build])
1111
AC_CONFIG_HEADERS([config.h libxml++config.h])
1212

1313
AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 no-define nostdinc subdir-objects])
14-
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
14+
# Support silent build rules.
15+
# Disable by either passing --disable-silent-rules to configure or passing V=1 to make.
16+
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
1517
AM_MAINTAINER_MODE([disable])
1618
AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
1719

@@ -28,7 +30,7 @@ MM_CONFIG_DOCTOOL_DIR([docs])
2830
AC_SUBST([LIBXMLXX_SO_VERSION], [1:0:0])
2931

3032
AC_PROG_CXX
31-
MM_AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
33+
MM_AX_CXX_COMPILE_STDCXX([11], [noext],[mandatory])
3234

3335
LT_PREREQ([2.2.6])
3436
LT_INIT([dlopen win32-dll disable-static])

docs/reference/Doxyfile.in

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Doxyfile 1.8.9.1
1+
# Doxyfile 1.8.11
22
# @configure_input@
33

44
#---------------------------------------------------------------------------
@@ -47,6 +47,7 @@ CPP_CLI_SUPPORT = NO
4747
SIP_SUPPORT = NO
4848
IDL_PROPERTY_SUPPORT = YES
4949
DISTRIBUTE_GROUP_DOC = NO
50+
GROUP_NESTED_COMPOUNDS = NO
5051
SUBGROUPING = YES
5152
INLINE_GROUPED_CLASSES = NO
5253
INLINE_SIMPLE_STRUCTS = NO
@@ -95,11 +96,12 @@ CITE_BIB_FILES =
9596
#---------------------------------------------------------------------------
9697
# Configuration options related to warning and progress messages
9798
#---------------------------------------------------------------------------
98-
QUIET = NO
99+
QUIET = YES
99100
WARNINGS = YES
100101
WARN_IF_UNDOCUMENTED = YES
101102
WARN_IF_DOC_ERROR = YES
102103
WARN_NO_PARAMDOC = NO
104+
WARN_AS_ERROR = NO
103105
WARN_FORMAT = "$file:$line: $text"
104106
WARN_LOGFILE = reference/doxygen.log
105107
#---------------------------------------------------------------------------
@@ -143,6 +145,8 @@ REFERENCES_LINK_SOURCE = YES
143145
SOURCE_TOOLTIPS = YES
144146
USE_HTAGS = NO
145147
VERBATIM_HEADERS = NO
148+
CLANG_ASSISTED_PARSING = NO
149+
CLANG_OPTIONS =
146150
#---------------------------------------------------------------------------
147151
# Configuration options related to the alphabetical class index
148152
#---------------------------------------------------------------------------
@@ -227,6 +231,7 @@ LATEX_BATCHMODE = NO
227231
LATEX_HIDE_INDICES = NO
228232
LATEX_SOURCE_CODE = NO
229233
LATEX_BIB_STYLE = plain
234+
LATEX_TIMESTAMP = NO
230235
#---------------------------------------------------------------------------
231236
# Configuration options related to the RTF output
232237
#---------------------------------------------------------------------------

0 commit comments

Comments
 (0)