|
|
|
|
@ -365,7 +365,7 @@ AC_DEFUN([AX_USE_CXX], [ |
|
|
|
|
CXXFLAGS="${CXXFLAGS//-g -O2/}" |
|
|
|
|
CFLAGS="${CFLAGS//-g -O2/}" |
|
|
|
|
|
|
|
|
|
# pass compile flags to make distcheck |
|
|
|
|
# pass compile flags to make distcheck |
|
|
|
|
AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" |
|
|
|
|
AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS) |
|
|
|
|
|
|
|
|
|
@ -391,6 +391,20 @@ maintainer-clean-cxx-targets: |
|
|
|
|
EOF |
|
|
|
|
]) |
|
|
|
|
|
|
|
|
|
# require specific C++ version |
|
|
|
|
AC_DEFUN([AX_USE_CXX_11], [ |
|
|
|
|
AX_USE_CXX |
|
|
|
|
AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) |
|
|
|
|
]) |
|
|
|
|
AC_DEFUN([AX_USE_CXX_14], [ |
|
|
|
|
AX_USE_CXX |
|
|
|
|
AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) |
|
|
|
|
]) |
|
|
|
|
AC_DEFUN([AX_USE_CXX_17], [ |
|
|
|
|
AX_USE_CXX |
|
|
|
|
AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) |
|
|
|
|
]) |
|
|
|
|
|
|
|
|
|
# use this in configure.ac to support old school C |
|
|
|
|
AC_DEFUN([AX_USE_C], [ |
|
|
|
|
AC_LANG(C) |
|
|
|
|
@ -637,7 +651,6 @@ AC_DEFUN([AX_USE_DOXYGEN], [ |
|
|
|
|
AC_CHECK_PROG(have_doxygen, doxygen, yes, no) |
|
|
|
|
AC_CHECK_PROG(have_dot, dot, yes, no) |
|
|
|
|
AC_CHECK_PROG(have_mscgen, mscgen, yes, no) |
|
|
|
|
AM_CONDITIONAL(NEED_PLANTUML, test "$have_doxygen" = "yes" -a "1.8.11" != $((echo "1.8.11"; doxygen -v 2>/dev/null) | sort -V | head -1)) |
|
|
|
|
PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf |
|
|
|
|
AC_SUBST(PDF_DOC) |
|
|
|
|
if test "$have_doxygen" = "no"; then |
|
|
|
|
@ -662,28 +675,12 @@ AC_DEFUN([AX_USE_DOXYGEN], [ |
|
|
|
|
AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf gen-uml-images], [doc/makefile.in]) |
|
|
|
|
test -f doc/makefile.in && cat >> doc/makefile.in <<EOF |
|
|
|
|
#### Begin: Appended by $0 |
|
|
|
|
doc: doxyfile @NEED_PLANTUML_TRUE@ gen-uml-images |
|
|
|
|
@NEED_PLANTUML_TRUE@ doxyadd() { grep -q "\$\$[1] += \$\$[2]" doxyfile || sed -i '/^'"\$\$[1]"' *=/a'"\$\$[1]"' += '"\$\$[2]" doxyfile; }; \\ |
|
|
|
|
@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"startuml{1}=@image html \\\\1\\\\n@image latex \\\\1\\\\n\\\\if DontIgnorePlantUMLCode"'; \\ |
|
|
|
|
@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"enduml=\\\\endif"'; \\ |
|
|
|
|
@NEED_PLANTUML_TRUE@ doxyadd IMAGE_PATH '"gen-uml-images"'; |
|
|
|
|
doc: doxyfile |
|
|
|
|
doxygen doxyfile |
|
|
|
|
@PEDANTIC_TRUE@ test \! -s doxygen.errors |
|
|
|
|
|
|
|
|
|
@NEED_PLANTUML_TRUE@EXTRA_DIST = ${EXTRA_DIST} plantuml.jar |
|
|
|
|
@NEED_PLANTUML_TRUE@ |
|
|
|
|
@NEED_PLANTUML_TRUE@gen-uml-images: |
|
|
|
|
@NEED_PLANTUML_TRUE@ test -d gen-uml-images || mkdir gen-uml-images |
|
|
|
|
@NEED_PLANTUML_TRUE@ eval \$\$(sed -n 's, *INPUT *\\(+\\?\\)= *\\(.*\\),INPUT\\1=" \\2",gp' doxyfile); \\ |
|
|
|
|
@NEED_PLANTUML_TRUE@ eval \$\$(sed -n 's, *FILE_PATTERNS *\\(+\\?\\)= *\\(.*\\),FILE_PATTERNS\\1=" \\2",gp' doxyfile); \\ |
|
|
|
|
@NEED_PLANTUML_TRUE@ SOURCES="**.("\$\$(echo \$\${FILE_PATTERNS} | sed 's,*.,,g;s, ,|,g')")"; \\ |
|
|
|
|
@NEED_PLANTUML_TRUE@ for src in \$\$INPUT; do \\ |
|
|
|
|
@NEED_PLANTUML_TRUE@ java -Djava.awt.headless=true -jar \${top_srcdir}/doc/plantuml.jar -v -o \$\$(pwd)/gen-uml-images "\$\$src/\$\$SOURCES"; \\ |
|
|
|
|
@NEED_PLANTUML_TRUE@ done |
|
|
|
|
|
|
|
|
|
clean-documentation: |
|
|
|
|
-rm doxygen.errors @PDF_DOC@ |
|
|
|
|
@NEED_PLANTUML_TRUE@ -rm -rf gen-uml-images |
|
|
|
|
distclean-documentation: |
|
|
|
|
-rm -r html |
|
|
|
|
-rm @PACKAGE_NAME@.doxytag |
|
|
|
|
|
Marc Wäckerlin
6 years ago