From c6f93fed5898bb2c3d084a6c0d153275063a059b Mon Sep 17 00:00:00 2001
From: Alexander Schlarb <alexander@ninetailed.ninja>
Date: Thu, 12 Dec 2019 11:53:48 +0100
Subject: Make building of `ayatana-indicator-loader3` optional

---
 configure.ac      | 16 ++++++++++++++--
 tools/Makefile.am |  6 +++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 01a62da..1ddda03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,12 @@ AS_IF([test "x$enable_deprecations" = xno],
   [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"]
 )
 
+AC_ARG_ENABLE([ido],
+  [AS_HELP_STRING([--enable-ido],
+    [enable indicator widget loader @<:@default=yes@:>@])],
+  [],
+  [enable_ido=yes])
+
 ##############################
 # Dependencies
 ##############################
@@ -62,6 +68,7 @@ GTK3_REQUIRED_VERSION=3.6
 GIO_UNIX_REQUIRED_VERSION=2.37
 IDO_REQUIRED_VERSION=0.4.0
 
+
 AC_ARG_WITH([gtk],
   [AS_HELP_STRING([--with-gtk],
     [Which version of gtk to use @<:@default=3@:>@])],
@@ -70,8 +77,10 @@ AC_ARG_WITH([gtk],
 AS_IF([test "x$with_gtk" = x3],
         [PKG_CHECK_MODULES(LIBINDICATOR,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                           gmodule-2.0
-                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          libayatana-ido3-0.4 >= $IDO_REQUIRED_VERSION)
+                                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION)
+         AS_IF([test "x$enable_ido" = xyes], [
+           PKG_CHECK_MODULES(LIBINDICATOR_IDO, libayatana-ido3-0.4 >= $IDO_REQUIRED_VERSION)
+         ])
         ],
       [test "x$with_gtk" = x2],
         [PKG_CHECK_MODULES(LIBINDICATOR,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
@@ -80,7 +89,9 @@ AS_IF([test "x$with_gtk" = x3],
         ],
       [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
 )
+
 AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+AM_CONDITIONAL(USE_IDO, [test "$enable_ido" = "yes"])
 
 LT_LIB_M
 AC_SUBST(LIBM)
@@ -200,6 +211,7 @@ Libindicator Configuration:
 	Prefix:                 $prefix
 	GTK+ Version:           $with_gtk
 	
+	Enable IDO loader:      $enable_ido
 	Enable tests:           $enable_tests
 	Enable debugging:       $enable_debug
 	Coverage reporting:     $use_gcov
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4aa3cfc..6f85429 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,8 +1,10 @@
+if USE_IDO
 if USE_GTK3
 INDICATOR_LIB = -layatana-indicator3
 libexec_PROGRAMS = ayatana-indicator-loader3
 VER=3
 endif
+endif
 
 
 #############################
@@ -14,11 +16,13 @@ ayatana_indicator_loader_SOURCES = \
 
 ayatana_indicator_loader_CFLAGS = \
 	-Wall -Werror \
-	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
+	$(LIBINDICATOR_CFLAGS) \
+	$(LIBINDICATOR_IDO_CFLAGS) -I$(top_srcdir) \
 	-DBUILD_DIR="\"$(builddir)\""
 
 ayatana_indicator_loader_LDADD = \
 	$(LIBINDICATOR_LIBS) \
+	$(LIBINDICATOR_IDO_LIBS) \
 	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
-- 
cgit v1.2.3