From f43a1de0b053f48ed6cb137280a85d65101ccebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
 <zboszor@gmail.com>
Date: Thu, 8 Feb 2024 15:43:11 +0100
Subject: [PATCH] Support external libnanomsg better for
 --use_system_libnanomsg=true
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nanomsg headers are installed in /usr/include/nanomsg but only
ancient versions (0.8 and before) provided -I/usr/include/nanomsg
in libnanomsg.pc, if ever. The embedded source is for 1.1.0, the
previous commit stopped using libnanomsg.pc.

Instead, pass -DSYSTEM_NANOMSG=1 to the compiler when using
--use_system_libnanomsg=true and use conditional compiling to
include headers from the correct location.

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
 binding.gyp         |  8 +++++++-
 src/node_nanomsg.cc | 21 ++++++++++++++++++++-
 src/poll_ctx.cc     |  4 ++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/binding.gyp b/binding.gyp
index 8395d52..7072e3b 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -19,11 +19,14 @@
         }],
         ['OS=="linux" and use_system_libnanomsg=="true"', {
           'include_dirs+': [
-            '<!@(pkg-config nanomsg --cflags-only-I | sed s/-I//g)/nanomsg  || echo "")'
+            '<!@(pkg-config nanomsg --cflags-only-I | sed s/-I//g || echo "")'
           ],
           'libraries': [
             '<!@(pkg-config nanomsg --libs || echo "")'
           ],
+          'defines': [
+            'SYSTEM_NANOMSG=1',
+          ],
         }],
         ['OS=="mac" and use_system_libnanomsg=="true"', {
           'include_dirs+': [
@@ -32,6 +35,9 @@
           'libraries': [
             '<!@(pkg-config nanomsg --libs || echo "")'
           ],
+          'defines': [
+            'SYSTEM_NANOMSG=1',
+          ],
         }],
         ['OS=="mac" and asan=="true"', {
           'xcode_settings': {
diff --git a/src/node_nanomsg.cc b/src/node_nanomsg.cc
index 7e9ede1..43abfec 100644
--- a/src/node_nanomsg.cc
+++ b/src/node_nanomsg.cc
@@ -1,16 +1,35 @@
+#ifndef SYSTEM_NANOMSG
+
 #include "bus.h"
 #include "inproc.h"
 #include "ipc.h"
 #include "nn.h"
 #include "pair.h"
 #include "pipeline.h"
-#include "poll_ctx.h"
 #include "pubsub.h"
 #include "reqrep.h"
 #include "survey.h"
 #include "tcp.h"
 #include "ws.h"
 
+#else
+
+#include "nanomsg/bus.h"
+#include "nanomsg/inproc.h"
+#include "nanomsg/ipc.h"
+#include "nanomsg/nn.h"
+#include "nanomsg/pair.h"
+#include "nanomsg/pipeline.h"
+#include "nanomsg/pubsub.h"
+#include "nanomsg/reqrep.h"
+#include "nanomsg/survey.h"
+#include "nanomsg/tcp.h"
+#include "nanomsg/ws.h"
+
+#endif
+
+#include "poll_ctx.h"
+
 NAN_METHOD(Socket) {
   int domain = Nan::To<int>(info[0]).FromJust();
   int protocol = Nan::To<int>(info[1]).FromJust();
diff --git a/src/poll_ctx.cc b/src/poll_ctx.cc
index 79da123..404cf5f 100644
--- a/src/poll_ctx.cc
+++ b/src/poll_ctx.cc
@@ -1,4 +1,8 @@
+#ifndef SYSTEM_NANOMSG
 #include "nn.h"
+#else
+#include "nanomsg/nn.h"
+#endif
 #include "poll_ctx.h"
 
 void PollCtx::on_readable(uv_poll_t* req, int /* status */, int events) {