[gnome-applets/wip/muktupavels/cleanup: 3/17] build: always build gweather applet

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 97d359ec2de4fff896dee89f61b99f6167841c31
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Mar 24 16:26:14 2020 +0200

    build: always build gweather applet

 Makefile.am      |  8 +-------
 configure.ac     | 10 +++-------
 help/Makefile.am |  7 +------
 3 files changed, 5 insertions(+), 20 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ec8a9f1bf..0af01b745 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,12 +5,6 @@ if BUILD_GTOP_APPLETS
 gtop_SUBDIRS = $(gtop_applets)
 endif
 
-libgweather_applets = \
-       gweather
-if BUILD_LIBGWEATHER_APPLETS
-libgweather_SUBDIRS = $(libgweather_applets)
-endif
-
 if BUILD_BATTSTAT_APPLET
 battstat_SUBDIR = battstat
 endif
@@ -38,6 +32,7 @@ always_built_SUBDIRS =  \
        drivemount      \
        inhibit         \
        geyes           \
+       gweather \
        mini-commander \
        sticky-notes    \
        trash \
@@ -52,7 +47,6 @@ SUBDIRS = \
        po                      \
        $(always_built_SUBDIRS) \
        $(gtop_SUBDIRS)         \
-       $(libgweather_SUBDIRS)  \
        $(vfs_SUBDIRS)          \
        $(battstat_SUBDIR)      \
        $(accessx_status_SUBDIR)\
diff --git a/configure.ac b/configure.ac
index fb386f90c..07d1675e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,12 +208,8 @@ fi
 dnl -- check for libxml2 (required) ------------------------------------------
 PKG_CHECK_MODULES(XML2, libxml-2.0 >= $LIBXML_REQUIRED)
 
- dnl -- check for libgweather (required for gweather applet) ------------------
-build_libgweather_applets=false
-PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED,
-                 build_libgweather_applets=true,
-                 AC_MSG_WARN([libgweather not found. Not building the weather applet.]))
-AM_CONDITIONAL(BUILD_LIBGWEATHER_APPLETS, $build_libgweather_applets)
+ dnl -- check for libgweather (required) ------------------
+PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED)
 
  dnl -- check for tracker-sparql (required for tracker-search-bar) ------------
 TRACKER_SEARCH_BAR_REQUIRED="tracker-sparql-2.0"
@@ -658,7 +654,7 @@ echo "    command .......................: always"
 echo "    cpufreq .......................: $build_cpufreq_applet"
 echo "    drivemount ....................: always"
 echo "    geyes .........................: always"
-echo "    gweather ......................: $build_libgweather_applets"
+echo "    gweather ......................: always"
 echo "    inhibit .......................: always"
 echo "    mini-commander ................: always"
 echo "    multiload .....................: $build_gtop_applets"
diff --git a/help/Makefile.am b/help/Makefile.am
index ef46a59d7..b6ed2a85b 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = \
        charpick \
        drivemount \
        geyes \
+       gweather \
        mini-commander \
        sticky-notes \
        trash \
@@ -27,12 +28,6 @@ SUBDIRS += \
        $(NULL)
 endif
 
-if BUILD_LIBGWEATHER_APPLETS
-SUBDIRS += \
-       gweather \
-       $(NULL)
-endif
-
 if BUILD_GTOP_APPLETS
 SUBDIRS += \
        multiload \