From b2c92ee1b1537f0007a76d2dabdb6320467d03d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net> Date: Sun, 4 Feb 2024 17:13:40 -0500 Subject: [PATCH] NetBSD doesn't ship with a .pc file for libarchive (which it does ship with) Le Sigh --- src/sbbs3/GNUmakefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/sbbs3/GNUmakefile b/src/sbbs3/GNUmakefile index 7316ea5e5a..0228efd06b 100644 --- a/src/sbbs3/GNUmakefile +++ b/src/sbbs3/GNUmakefile @@ -48,8 +48,6 @@ UTIL_LDFLAGS := $(LDFLAGS) UTIL_LDFLAGS += $(SMBLIB_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV_LDFLAGS) $(ENCODE_LDFLAGS) CONSOLE_LDFLAGS += $(LDFLAGS) $(SMBLIB_LDFLAGS) $(XPDEV_LDFLAGS) UTIL_LIBS += $(HASH_LIBS) -FILE_LIBS = $(shell pkg-config libarchive -libs) -CFLAGS += $(shell pkg-config libarchive -cflags) ifndef bcc ifneq ($(os),sunos) @@ -104,6 +102,12 @@ ifndef WITHOUT_MOSQUITTO endif endif endif +ifeq ($(shell pkg-config libarchive --exists && echo "yes"),yes) + CFLAGS += $(shell pkg-config libarchive --cflags) + FILE_LIBS = $(shell pkg-config libarchive -libs) +else + FILE_LIBS = -larchive +endif include sbbsdefs.mk MT_CFLAGS += $(SBBSDEFS) -- GitLab