[gnome-panel/merge-gnome-applets] battstat applet: add missing check for hal and upower

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

commit 627854d5f0a853308bdcf6a9cebd992a92b64fc5
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue May 27 21:43:43 2014 +0300

    battstat applet: add missing check for hal and upower

 configure.ac               |   47 +++++++++++++++++++++++++++++++++++++++++++
 gnome-applets/configure.ac |   48 --------------------------------------------
 2 files changed, 47 insertions(+), 48 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 388ca90..df4dc1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,8 @@ DBUS_GLIB_REQUIRED=0.80
 DCONF_REQUIRED=0.13.4
 LIBRSVG_REQUIRED=2.36.2
 GUCHARMAP3_REQUIRED=2.33.0
+HAL_REQUIRED=0.5.3
+UPOWER_REQUIRED=0.9.4
 
 dnl pkg-config dependency checks
 
@@ -310,6 +312,48 @@ case $host in
        ;;
 esac
 
+dnl -- check for libhal (optional) --------------------------------------------
+HAL_CFLAGS=
+HAL_LIBS=
+AC_ARG_WITH(hal,[  --without-hal           build without hal support])
+
+if test "x$with_hal" != xno; then
+       PKG_CHECK_MODULES(HAL, hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
+                 HAVE_HAL="yes",
+                 HAVE_HAL="no")
+
+       if test "x$HAVE_HAL" = "xyes"; then
+               AC_DEFINE(HAVE_HAL, 1, [HAL available])
+       fi
+else
+       AC_MSG_WARN(["Hal support disabled"])
+fi
+
+AC_SUBST(HAL_CFLAGS)
+AC_SUBST(HAL_LIBS)
+
+dnl -- check for libupower-glib (optional) --------------------------------------------
+UPOWER_CFLAGS=
+UPOWER_LIBS=
+AC_ARG_WITH(upower,[  --without-upower           build without upower support])
+
+if test "x$with_upower" != xno; then
+       PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED,
+                 HAVE_UPOWER="yes",
+                 HAVE_UPOWER="no")
+
+       LT_LIB_M
+       if test "x$HAVE_UPOWER" = "xyes"; then
+               AC_DEFINE(HAVE_UPOWER, 1, [UPOWER available])
+       fi
+else
+       AC_MSG_WARN(["upower support disabled"])
+fi
+
+AC_SUBST(UPOWER_CFLAGS)
+AC_SUBST(UPOWER_LIBS)
+AC_SUBST(LIBM)
+
 dnl -- check for gucharmap (optional) -----------------------------------------
 
 PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED],
@@ -522,4 +566,7 @@ echo "
              - charpick                always
                 - gucharmap support    $have_gucharmap
 
+            Using HAL:                 $HAVE_HAL
+            Using UPOWER:              $HAVE_UPOWER
+
 "
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index ceebaa9..95cf6f3 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -21,8 +21,6 @@ LIBGTOP_REQUIRED=2.11.92
 LIBXKLAVIER_REQUIRED=4.0
 LIBWNCK_REQUIRED=2.91.0
 LIBNOTIFY_REQUIRED=0.7
-HAL_REQUIRED=0.5.3
-UPOWER_REQUIRED=0.9.4
 DBUS_REQUIRED=1.1.2
 DBUS_GLIB_REQUIRED=0.74
 GNOME_ICON_THEME_REQUIRED=2.15.91
@@ -200,50 +198,6 @@ AM_CONDITIONAL(HAVE_POLKIT, test "x$HAVE_POLKIT" = "xyes")
 AC_SUBST(POLKIT_CFLAGS)
 AC_SUBST(POLKIT_LIBS)
 
-
-dnl -- check for libhal (optional) --------------------------------------------
-HAL_CFLAGS=
-HAL_LIBS=
-AC_ARG_WITH(hal,[  --without-hal           build without hal support])
-
-if test "x$with_hal" != xno; then
-       PKG_CHECK_MODULES(HAL, hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
-                 HAVE_HAL="yes",
-                 HAVE_HAL="no")
-
-       if test "x$HAVE_HAL" = "xyes"; then
-               AC_DEFINE(HAVE_HAL, 1, [HAL available])
-       fi
-else
-       AC_MSG_WARN(["Hal support disabled"])
-fi
-
-AC_SUBST(HAL_CFLAGS)
-AC_SUBST(HAL_LIBS)
-
-dnl -- check for libupower-glib (optional) --------------------------------------------
-UPOWER_CFLAGS=
-UPOWER_LIBS=
-AC_ARG_WITH(upower,[  --without-upower           build without upower support])
-
-if test "x$with_upower" != xno; then
-       PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED,
-                 HAVE_UPOWER="yes",
-                 HAVE_UPOWER="no")
-
-       LT_LIB_M
-       if test "x$HAVE_UPOWER" = "xyes"; then
-               AC_DEFINE(HAVE_UPOWER, 1, [UPOWER available])
-       fi
-else
-       AC_MSG_WARN(["upower support disabled"])
-fi
-
-AC_SUBST(UPOWER_CFLAGS)
-AC_SUBST(UPOWER_LIBS)
-AC_SUBST(LIBM)
-
-
 dnl -- check for Python/GNOME modules (optional) ------------------------------
 PKG_CHECK_MODULES(PYGOBJECT, pygobject-3.0, HAVE_PYGOBJECT="yes", HAVE_PYGOBJECT="no")
 
@@ -619,7 +573,5 @@ gnome-applets-$VERSION configure summary:
 
        Using DBUS:                     $HAVE_DBUS
        Using NetworkManager:           $HAVE_NETWORKMANAGER
-       Using HAL:                      $HAVE_HAL
-       Using UPOWER:                   $HAVE_UPOWER
        Enabling IPv6:                  $have_ipv6
 " >&2