From 5da4a17cee4a4ba161fcd6aedbd99094446e6502 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Thu, 24 Feb 2022 10:22:23 -0500
Subject: Makefile: Automatically discover the right flags to build with
 Oniguruma

Fixes #82.
---
 .github/workflows/freebsd.yml |  2 +-
 Makefile                      | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index 40ed994..cdfa158 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -30,4 +30,4 @@ jobs:
         run: |
           muon=$(tailscale ip -6 muon)
           rsync -rl --delete . "[$muon]:bfs"
-          ssh "$muon" 'gmake -C bfs -j$(sysctl -n hw.ncpu) distcheck EXTRA_CPPFLAGS="-I/usr/local/include" EXTRA_LDFLAGS="-L/usr/local/lib"'
+          ssh "$muon" 'gmake -C bfs -j$(sysctl -n hw.ncpu) distcheck
diff --git a/Makefile b/Makefile
index 7c5cdcc..c22a9a7 100644
--- a/Makefile
+++ b/Makefile
@@ -73,8 +73,15 @@ WITH_ONIGURUMA := y
 endif
 
 ifdef WITH_ONIGURUMA
+LOCAL_CPPFLAGS += -DBFS_WITH_ONIGURUMA=1
+
+ONIG_CONFIG := $(shell command -v onig-config 2>/dev/null)
+ifdef ONIG_CONFIG
+LOCAL_CFLAGS += $(shell $(ONIG_CONFIG) --cflags)
+LOCAL_LDLIBS += $(shell $(ONIG_CONFIG) --libs)
+else
 LOCAL_LDLIBS += -lonig
-LOCAL_CFLAGS += -DBFS_WITH_ONIGURUMA=1
+endif
 endif
 
 ifeq ($(OS),Linux)
@@ -87,19 +94,19 @@ endif
 ifdef WITH_ACL
 LOCAL_LDLIBS += -lacl
 else
-LOCAL_CFLAGS += -DBFS_HAS_SYS_ACL=0
+LOCAL_CPPFLAGS += -DBFS_HAS_SYS_ACL=0
 endif
 
 ifdef WITH_ATTR
 LOCAL_LDLIBS += -lattr
 else
-LOCAL_CFLAGS += -DBFS_HAS_SYS_XATTR=0
+LOCAL_CPPFLAGS += -DBFS_HAS_SYS_XATTR=0
 endif
 
 ifdef WITH_LIBCAP
 LOCAL_LDLIBS += -lcap
 else
-LOCAL_CFLAGS += -DBFS_HAS_SYS_CAPABILITY=0
+LOCAL_CPPFLAGS += -DBFS_HAS_SYS_CAPABILITY=0
 endif
 
 LOCAL_LDFLAGS += -Wl,--as-needed
-- 
cgit v1.2.3