[Xfce4-commits] [xfce/libxfce4ui] 01/01: Make glibtop an optional dependency

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/libxfce4ui.

commit 87a5c0d5720fd832f5f926cf65b28dcc10669a46
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Wed Dec 4 12:05:45 2019 +0100

    Make glibtop an optional dependency
---
 xfce4-about/Makefile.am | 14 +++++++++++---
 xfce4-about/main.c      | 10 ++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/xfce4-about/Makefile.am b/xfce4-about/Makefile.am
index a3f26b0..2665762 100644
--- a/xfce4-about/Makefile.am
+++ b/xfce4-about/Makefile.am
@@ -10,17 +10,25 @@ bin_PROGRAMS = \
 	xfce4-about
 
 xfce4_about_built_sources = \
-	system-info.c \
-	system-info.h \
 	about-dialog-ui.h
 
 xfce4_about_SOURCES = \
 	$(xfce4_about_built_sources) \
 	contributors.h \
 	translators.h \
-	system-info.h \
 	main.c
 
+if ENABLE_GLIBTOP
+
+xfce4_about_built_sources += \
+	system-info.c \
+	system-info.h
+
+xfce4_about_SOURCES += \
+	system-info.h
+
+endif
+
 xfce4_about_CFLAGS = \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(GTK3_CFLAGS) \
diff --git a/xfce4-about/main.c b/xfce4-about/main.c
index c99e554..4c0b0ea 100644
--- a/xfce4-about/main.c
+++ b/xfce4-about/main.c
@@ -30,9 +30,12 @@
 
 #include "contributors.h"
 #include "translators.h"
-#include "system-info.h"
 #include "about-dialog-ui.h"
 
+#ifdef HAVE_GLIBTOP
+#include "system-info.h"
+#endif
+
 #define MARGIN 20
 
 
@@ -55,7 +58,7 @@ static GOptionEntry opt_entries[] =
 };
 
 
-
+#ifdef HAVE_GLIBTOP
 static void
 xfce_about_system (GtkBuilder *builder)
 {
@@ -103,6 +106,7 @@ xfce_about_system (GtkBuilder *builder)
   memory_text = g_format_size_full (mem.total, G_FORMAT_SIZE_IEC_UNITS);
   gtk_label_set_text (GTK_LABEL (label), memory_text ? memory_text : "");
 }
+#endif
 
 
 
@@ -545,7 +549,9 @@ main (gint    argc,
   xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog), version);
   g_free (version);
 
+#ifdef HAVE_GLIBTOP
   xfce_about_system (builder);
+#endif
 
   object = gtk_builder_get_object (builder, "about-buffer");
   xfce_about_about (GTK_TEXT_BUFFER (object));

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.