[smuxi: 18/37] autotools: use nini binary bundling too for macOS

[Mirco M. M. Bauer <mmmbauer src gnome org>]

commit 8af03dc479421cff2d2a65e44259042256466b25
Author: Andres G. Aragoneses <knocte gmail com>
Date:   Sat Apr 11 00:48:34 2020 +0800

    autotools: use nini binary bundling too for macOS

 configure.ac           | 26 ++++++++++++++++----------
 src/Engine/Makefile.am |  9 ++++++++-
 2 files changed, 24 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b43ae0cd..9ddfab1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -261,21 +261,27 @@ else
        AM_CONDITIONAL([ENABLE_TESTS], false)
 fi
 
-PKG_CHECK_EXISTS([nini-1.1], FOUND_NINI=yes, FOUND_NINI=no)
 nini_files=
-if test "x$FOUND_NINI" = "xyes"; then
-       nini_files=`pkg-config --variable=Libraries nini-1.1`
-       if test -z "$nini_files" ; then
-               # Debian-based distros place Nini into the GAC
-               PKG_CHECK_MODULES([NINI], [nini-1.1])
+if test "x$(uname)" != "xDarwin"; then
+       PKG_CHECK_EXISTS([nini-1.1], FOUND_NINI=yes, FOUND_NINI=no)
+       if test "x$FOUND_NINI" = "xyes"; then
+               nini_files=`pkg-config --variable=Libraries nini-1.1`
+               if test -z "$nini_files" ; then
+                       # Debian-based distros place Nini into the GAC
+                       PKG_CHECK_MODULES([NINI], [nini-1.1])
+               else
+                       # openSUSE has Nini as a private assembly; need to copy it.
+                       AC_SUBST([NINI_LIBS], "$nini_files")
+               fi
        else
-               # openSUSE has Nini as a private assembly; need to copy it.
-               AC_SUBST([NINI_LIBS], "$nini_files")
+               PKG_CHECK_MODULES([NINI], [nini >= 1.1])
        fi
+       AM_CONDITIONAL([BUNDLE_NINI], test -n "$nini_files")
+       AM_CONDITIONAL([BUNDLE_NINI_BLOB], false)
 else
-       PKG_CHECK_MODULES([NINI], [nini >= 1.1])
+       AM_CONDITIONAL([BUNDLE_NINI], false)
+       AM_CONDITIONAL([BUNDLE_NINI_BLOB], true)
 fi
-AM_CONDITIONAL([BUNDLE_NINI], test -n "$nini_files")
 
 AC_ARG_WITH([db4o],
        AC_HELP_STRING([--with-db4o=auto|system|included], [Use system or included db4o 
@<:@default=auto@:>@]),
diff --git a/src/Engine/Makefile.am b/src/Engine/Makefile.am
index b2e62bea..2972c440 100644
--- a/src/Engine/Makefile.am
+++ b/src/Engine/Makefile.am
@@ -40,6 +40,13 @@ else
 LOG4NET_REF_LIBS=$(LOG4NET_LIBS)
 endif
 
+if BUNDLE_NINI_BLOB
+NINI_DLL_SOURCE=../../lib/Nini.dll
+NINI_REF_LIBS=-r:$(NINI_DLL_SOURCE)
+else
+NINI_REF_LIBS=$(NINI_LIBS)
+endif
+
 AL=al2
 SATELLITE_ASSEMBLY_NAME=.resources.dll
 
@@ -139,7 +146,7 @@ REFERENCES =  \
        System.Xml \
        Mono.Posix \
        Mono.Data.Sqlite \
-       $(NINI_LIBS) \
+       $(NINI_REF_LIBS) \
        $(LOG4NET_REF_LIBS) \
        $(DB4O_LIBS) \
        $(DB4O_INCLUDED_LIBS)