commit 35410cd45939ef862248ce2c89c23a9c569ca96b
parent 61c503be9ffc16a17314c1585b8a4acbdc16c09d
Author: Christian Grothoff <christian@grothoff.org>
Date: Fri, 21 Nov 2025 20:52:34 +0100
-fix dist rules
Diffstat:
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
@@ -68,8 +68,8 @@ m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION], [ACTION-IF-NOT-FOUND])
-dnl ---------------------------------------------------------
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
dnl Since: 0.16
dnl
dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
@@ -77,12 +77,6 @@ dnl first found in the path. Checks that the version of pkg-config found
dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
dnl used since that's the first version where most current features of
dnl pkg-config existed.
-dnl
-dnl If pkg-config is not found or older than specified, it will result
-dnl in an empty PKG_CONFIG variable. To avoid widespread issues with
-dnl scripts not checking it, ACTION-IF-NOT-FOUND defaults to aborting.
-dnl You can specify [PKG_CONFIG=false] as an action instead, which would
-dnl result in pkg-config tests failing, but no bogus error messages.
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -103,9 +97,6 @@ if test -n "$PKG_CONFIG"; then
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
-fi
-if test -z "$PKG_CONFIG"; then
- m4_default([$2], [AC_MSG_ERROR([pkg-config not found])])
fi[]dnl
])dnl PKG_PROG_PKG_CONFIG
diff --git a/src/donau/Makefile.am b/src/donau/Makefile.am
@@ -42,16 +42,16 @@ donau_httpd_SOURCES = \
donau-httpd_db.c donau-httpd_db.h \
donau-httpd_keys.c donau-httpd_keys.h \
donau-httpd_config.c donau-httpd_config.h \
- donau-httpd_charities_get.c donau_httpd_charity.h \
+ donau-httpd_charities_get.c donau-httpd_charity.h \
donau-httpd_charity_delete.c \
donau-httpd_charity_get.c donau-httpd_charity_insert.c \
donau-httpd_charity_patch.c \
donau-httpd_history_get.c \
donau-httpd_donation-statement.c donau-httpd_donation-statement.h \
- donau-httpd_batch-submit.c donau_httpd_batch-submit.h \
+ donau-httpd_batch-submit.c donau-httpd_batch-submit.h \
donau-httpd_terms.c donau-httpd_terms.h \
donau-httpd_csr.c donau-httpd_csr.h \
- donau-httpd_batch-issue.c donau_httpd_batch-issue.h
+ donau-httpd_batch-issue.c donau-httpd_batch-issue.h
# Testcases
