Skip to content
Snippets Groups Projects
Commit b2c92ee1 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

NetBSD doesn't ship with a .pc file for libarchive (which it does ship with) 

Le Sigh
parent 9c5354cb
Branches
Tags
1 merge request!455Update branch with changes from master
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 2 deletions
src/sbbs3/GNUmakefile
+ 6
− 2
View file @ b2c92ee1
...@@ -48,8 +48,6 @@ UTIL_LDFLAGS := $(LDFLAGS) ...@@ -48,8 +48,6 @@ UTIL_LDFLAGS := $(LDFLAGS)
UTIL_LDFLAGS += $(SMBLIB_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV_LDFLAGS) $(ENCODE_LDFLAGS) UTIL_LDFLAGS += $(SMBLIB_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV_LDFLAGS) $(ENCODE_LDFLAGS)
CONSOLE_LDFLAGS += $(LDFLAGS) $(SMBLIB_LDFLAGS) $(XPDEV_LDFLAGS) CONSOLE_LDFLAGS += $(LDFLAGS) $(SMBLIB_LDFLAGS) $(XPDEV_LDFLAGS)
UTIL_LIBS += $(HASH_LIBS) UTIL_LIBS += $(HASH_LIBS)
FILE_LIBS = $(shell pkg-config libarchive -libs)
CFLAGS += $(shell pkg-config libarchive -cflags)
ifndef bcc ifndef bcc
ifneq ($(os),sunos) ifneq ($(os),sunos)
...@@ -104,6 +102,12 @@ ifndef WITHOUT_MOSQUITTO ...@@ -104,6 +102,12 @@ ifndef WITHOUT_MOSQUITTO
endif endif
endif 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 include sbbsdefs.mk
MT_CFLAGS += $(SBBSDEFS) MT_CFLAGS += $(SBBSDEFS)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment