Hello libzmf folks!
Installation of libzmf fails when the documentation is built using
Doxygen 1.14. The latest Doxygen does no longer create PNG images and
provides JavaScript files instead. Please find a proposed patch attached.
Further, some changes to the build system are attached, too. Pick what
you think suitable.
Bye
Christoph
--
Most customers will not accept source code with compile errors in it.
Dan Saks, CppCon 2016 (https://youtu.be/D7Sd8A6_fYU)
From d9639af70c6232f0e99959a80c068782bcba214c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <f...@grueninger.de>
Date: Wed, 28 May 2025 21:34:18 +0200
Subject: [PATCH 4/4] [automake] Conditional installation of PNG and JS file
from Doxygen
Since Doxygen 1.14 no PNG files are generated. Instead JavaScript
files are installed.
---
docs/doxygen/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/docs/doxygen/Makefile.am b/docs/doxygen/Makefile.am
index 4351042..9266b85 100644
--- a/docs/doxygen/Makefile.am
+++ b/docs/doxygen/Makefile.am
@@ -7,8 +7,9 @@ if WITH_LIBZMF_DOCS
install-data-am:
mkdir -p $(DESTDIR)$(docdir)/html
$(INSTALL_DATA) html/*.html $(DESTDIR)$(docdir)/html/
- $(INSTALL_DATA) html/*.png $(DESTDIR)$(docdir)/html/
$(INSTALL_DATA) html/*.css $(DESTDIR)$(docdir)/html/
+ test -f html/*.png || $(INSTALL_DATA) html/*.png $(DESTDIR)$(docdir)/html/
+ test -f html/*.js || $(INSTALL_DATA) html/*.js $(DESTDIR)$(docdir)/html/
uninstall-am:
-rm -rf $(DESTDIR)$(docdir)/html
--
2.49.0
From 39c39e35560eef171c24d42bcb9576ef14c3c18f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <f...@grueninger.de>
Date: Wed, 28 May 2025 20:22:29 +0200
Subject: [PATCH 3/4] [autoconf] Remove comment which triggers a warning
configure.ac:52: warning: whitespace-separated list contains macros;
configure.ac:52: in a future version of Autoconf they will not be expanded
configure.ac:52: note: 'dnl' is a macro
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 1afae42..f043163 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ AC_SUBST([REVENGE_LIBS])
# Find boost
# ==========
AC_CHECK_HEADERS(
- [dnl
+ [
boost/cstdint.hpp \
boost/math/constants/constants.hpp \
boost/optional.hpp \
--
2.49.0
From d2fc1bd7afa9541a291daf2c016c2f9beca7adcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <f...@grueninger.de>
Date: Wed, 28 May 2025 19:51:47 +0200
Subject: [PATCH 2/4] Increase required Autoconf to 2.68 and Automake to 1.16
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index ae9f87e..1afae42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -*-
# Process this file with autoconf to create configure.
-AC_PREREQ([2.65])
+AC_PREREQ([2.68])
# ====================
# Version informations
@@ -17,7 +17,7 @@ m4_define([libzmf_version],[libzmf_version_major.libzmf_version_minor.libzmf_ver
AC_INIT([libzmf],[libzmf_version])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([1.11 foreign dist-xz dist-bzip2])
+AM_INIT_AUTOMAKE([1.16 foreign dist-xz dist-bzip2])
AM_SILENT_RULES([yes])
AC_LANG([C++])
--
2.49.0
From 6399d8c28c48f0788941d426c120646f7970c25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <f...@grueninger.de>
Date: Wed, 28 May 2025 19:42:41 +0200
Subject: [PATCH 1/4] autoconf: Apply most changes from autoupdate
---
configure.ac | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2bbc1e5..ae9f87e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ m4_define([libzmf_version],[libzmf_version_major.libzmf_version_minor.libzmf_ver
# =============
AC_INIT([libzmf],[libzmf_version])
AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.11 foreign dist-xz dist-bzip2])
AM_SILENT_RULES([yes])
AC_LANG([C++])
@@ -136,16 +136,13 @@ AS_IF([test "x$platform_win32" = "xyes"],
AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
saved_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
- AC_TRY_COMPILE([], [],
- [
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[
AC_MSG_RESULT([yes])
CXXFLAGS="$CXXFLAGS -DLIBZMF_VISIBILITY"
- ],
- [
+ ],[
AC_MSG_RESULT([no])
CXXFLAGS="$saved_CXXFLAGS"
- ]
- )
+ ])
]
)
--
2.49.0
