[smuxi: 17/37] configure.ac: stop requiring NUnit to be present (useful for macOS)




commit 60e478c6404104b0e2e67aabae8d9d6a20e3cfa1
Author: Andres G. Aragoneses <knocte gmail com>
Date:   Sat Apr 11 00:46:53 2020 +0800

    configure.ac: stop requiring NUnit to be present (useful for macOS)

 .github/workflows/macOS.yml | 17 +++++++++--------
 configure.ac                | 15 ++++++++++++++-
 2 files changed, 23 insertions(+), 9 deletions(-)
---
diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
index 026354f5..eb51b8d1 100644
--- a/.github/workflows/macOS.yml
+++ b/.github/workflows/macOS.yml
@@ -14,11 +14,12 @@ jobs:
         ./build/install-deps-macos.sh
         ./autogen.sh && make release
 
-  macOS_tests_unit:
-    runs-on: macOS-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: Run unit test
-      run: |
-        ./build/install-deps-macos.sh
-        ./autogen.sh && make && make check
+# TODO:
+#  macOS_tests_unit:
+#    runs-on: macOS-latest
+#    steps:
+#    - uses: actions/checkout@v1
+#    - name: Run unit test
+#      run: |
+#        ./build/install-deps-macos.sh
+#        ./autogen.sh && make && make check
diff --git a/configure.ac b/configure.ac
index 699a7f95..b43ae0cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,13 +242,24 @@ fi
 AC_SUBST(XBUILD_FLAGS)
 
 # Required Libraries   
+
 if test "x$(uname)" != "xDarwin"; then
        PKG_CHECK_MODULES([LOG4NET], [log4net])
        AM_CONDITIONAL([BUNDLE_LOG4NET], false)
 else
        AM_CONDITIONAL([BUNDLE_LOG4NET], true)
 fi
-PKG_CHECK_MODULES([NUNIT], [nunit])
+
+AC_MSG_CHECKING([for NUnit])
+if $PKG_CONFIG 'nunit'; then
+       AC_MSG_RESULT(yes)
+       FOUND_NUNIT=yes
+       AM_CONDITIONAL([ENABLE_TESTS], true)
+else
+       AC_MSG_RESULT(no)
+       FOUND_NUNIT=no
+       AM_CONDITIONAL([ENABLE_TESTS], false)
+fi
 
 PKG_CHECK_EXISTS([nini-1.1], FOUND_NINI=yes, FOUND_NINI=no)
 nini_files=
@@ -789,6 +800,8 @@ AC_MSG_RESULT([
        * Compiler:            $CSC
        * Target CLI runtime:  $CLI_RUNTIME
 
+       * Tests:               $FOUND_NUNIT
+
        * Engines
          -------
          Core:                (sqlite: built-in, db4o: $WITH_DB4O)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]