From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 25 Jun 2021 09:05:57 +0000 (+0200)
Subject: - Fix configure does not require pkg-config if not needed.
X-Git-Tag: release-1.13.2rc1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba846a925a9c268a5eb32828d08611a3261dd3d4;p=thirdparty%2Funbound.git

- Fix configure does not require pkg-config if not needed.
---

diff --git a/configure b/configure
index 2f75ef782..3ed5dadda 100755
--- a/configure
+++ b/configure
@@ -14616,6 +14616,8 @@ CC=$lt_save_CC
 
 
 
+# pkg-config is only needed for these options, do not require it otherwise
+if test "$enable_systemd" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then
 
 
 
@@ -14736,6 +14738,7 @@ $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
+fi
 
 # Checks for header files.
 for ac_header in stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h
diff --git a/configure.ac b/configure.ac
index 8bf9b6b15..5ffbe6834 100644
--- a/configure.ac
+++ b/configure.ac
@@ -385,7 +385,10 @@ AC_CHECK_PROG(doxygen, doxygen, doxygen)
 AC_CHECK_TOOL(STRIP, strip)
 ACX_LIBTOOL_C_ONLY
 
+# pkg-config is only needed for these options, do not require it otherwise
+if test "$enable_systemd" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then
 PKG_PROG_PKG_CONFIG
+fi
 
 # Checks for header files.
 AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h],,, [AC_INCLUDES_DEFAULT])
diff --git a/doc/Changelog b/doc/Changelog
index ba8402b2e..5f14d9683 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,9 @@
 25 June 2021: Wouter
 	- Fix up permissions on rpl data file in tests.
+	- Fix testbound newline treatment in moment_read and tempfile write.
+	- Fix configure grep for reuseport default for failure.
+	- Fix compat ctime_r return value
+	- Fix configure does not require pkg-config if not needed.
 
 24 June 2021: Wouter
 	- Add analyzer and port compile github workflow.