GNOME.org
 

[gnome-panel/merge-gnome-applets] Fix battstat applet build

commit c61385ce1b150f703e5b843ac4f00f6066562096
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue May 27 21:18:32 2014 +0300

    Fix battstat applet build

 applets/Makefile.am          |    4 ++
 applets/battstat/Makefile.am |    8 +++-
 applets/battstat/battstat.h  |    1 +
 configure.ac                 |   99 ++++++++++++++++++++++++++++++++++++++++++
 gnome-applets/Makefile.am    |    5 --
 gnome-applets/configure.ac   |   99 ------------------------------------------
 6 files changed, 110 insertions(+), 106 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index 1c8a66f..d91426a 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -8,4 +8,8 @@ if APPLET_ACCESSX
 SUBDIRS += accessx-status
 endif
 
+if BUILD_BATTSTAT_APPLET
+SUBDIRS += battstat
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/applets/battstat/Makefile.am b/applets/battstat/Makefile.am
index 88a6cdf..724a6b5 100644
--- a/applets/battstat/Makefile.am
+++ b/applets/battstat/Makefile.am
@@ -24,13 +24,16 @@ SUBDIRS = help sounds $(APMDIR)
 DIST_SUBDIRS = help sounds apmlib
 
 AM_CPPFLAGS =                                  \
-       $(GNOME_APPLETS_CFLAGS)                 \
+       $(LIBPANEL_APPLET_CFLAGS) \
        $(LIBNOTIFY_CFLAGS)                     \
        $(HAL_CFLAGS)                           \
        $(UPOWER_CFLAGS)                        \
        $(APMINC)                               \
        $(ACPIINC)                              \
        $(WARN_CFLAGS)                          \
+       -I$(srcdir)/../../libpanel-applet \
+       -I$(top_builddir)/libpanel-applet \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DG_LOG_DOMAIN=\"battstat_applet\"      \
        -DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\"
 
@@ -55,7 +58,8 @@ battstat_applet_2_SOURCES = \
 
 
 battstat_applet_2_LDADD = \
-                    $(GNOME_APPLETS_LIBS) \
+                    ../../libpanel-applet/libpanel-applet-4.la \
+                    $(LIBPANEL_APPLET_LIBS) \
                     $(LIBNOTIFY_LIBS) \
                     $(HAL_LIBS) \
                     $(UPOWER_LIBS) \
diff --git a/applets/battstat/battstat.h b/applets/battstat/battstat.h
index 9b7acfd..ee5bd7e 100644
--- a/applets/battstat/battstat.h
+++ b/applets/battstat/battstat.h
@@ -163,6 +163,7 @@ void battstat_show_help( ProgressData *battstat, const char *section );
 const char *power_management_getinfo( BatteryStatus *status );
 const char *power_management_initialise (int no_hal, void (*callback) (void));
 void power_management_cleanup( void );
+int power_management_using_upower( void );
 int power_management_using_hal( void );
 
 
diff --git a/configure.ac b/configure.ac
index 6f82eed..b74748c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,6 +324,100 @@ if test "x$APPLET_ACCESSX" = "xtrue"; then
 fi
 CPPFLAGS=$savecppflags
 
+dnl ***************************************************************************
+dnl *** battstat specific checks                                            ***
+dnl ***************************************************************************
+
+dnl --disable-battstat=(yes|no)
+AC_ARG_ENABLE(battstat,
+             [  --disable-battstat=[@<:@no/yes@:>@]
+                          don't build battery monitor applet [@<:@default: no@:>@]],,
+             disable_battstat=no)
+
+HAVE_LIBAPM=no
+NEED_LIBAPM=no
+ACPIINC=
+build_battstat_applet=no
+
+if test x$disable_battstat = xno; then
+   build_battstat_applet=yes
+   AC_CHECK_HEADERS([err.h sys/sysctl.h])
+   case "${host}" in
+       powerpc-*-linux*)
+           NEED_LIBAPM=yes
+           AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
+          ;;
+       # list of supported OS cores that use libapm
+       *-*-linux*)
+          NEED_LIBAPM=yes
+          AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
+          ;;
+       # list of supported OS cores that do not use libapm
+       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
+          if [ -n "${OS_SYS}" ]; then
+              ACPIINC="-I${OS_SYS}"
+          else
+              ACPIINC="-I/usr/src/sys"
+          fi
+
+          savecppflags=$CPPFLAGS
+          CPPFLAGS="$CPPFLAGS $ACPIINC"
+          AC_CHECK_HEADER(dev/acpica/acpiio.h, have_acpiio=true, have_acpiio=false)
+          if test $have_acpiio = true; then
+            AC_DEFINE(HAVE_ACPIIO, 1, [Define if acpiio.h exists on the system])
+          fi
+
+          ;;
+       *)
+          echo "warning: ${host} is not supported by battstat_applet, not building" >&2
+          build_battstat_applet=no
+          ;;
+    esac
+fi
+
+AC_SUBST(HAVE_LIBAPM)
+AC_SUBST(NEED_LIBAPM)
+AC_SUBST(ACPIINC)
+AM_CONDITIONAL(HAVE_LIBAPM, test "x$HAVE_LIBAPM" = "xyes")
+AM_CONDITIONAL(NEED_LIBAPM, test "x$NEED_LIBAPM" = "xyes")
+AM_CONDITIONAL(BUILD_BATTSTAT_APPLET, test x$build_battstat_applet = xyes)
+
+dnl ***************************************************************************
+dnl *** Set install directories                                             ***
+dnl ***************************************************************************
+iconsdir="${datadir}/icons"
+AC_SUBST(iconsdir)
+pixmapsdir="${datadir}/pixmaps"
+AC_SUBST(pixmapsdir)
+pkgdatadir="${datadir}/gnome-applets"
+AC_SUBST(pkgdatadir)
+builderdir="${pkgdatadir}/builder"
+AC_SUBST(builderdir)
+
+AC_DEFINE_DIR(GNOME_ICONDIR, "${iconsdir}", [Gnome Icon Directory])
+AC_DEFINE_DIR(GNOME_PIXMAPSDIR, "${pixmapsdir}", [Gnome Pixmaps Directory])
+AC_DEFINE_DIR(GTK_BUILDERDIR, "${builderdir}", [GtkBuilder Resources Directory])
+AC_DEFINE_DIR(DATADIR, "${datadir}", [datadir])
+AC_DEFINE_DIR(SYSCONFDIR, "${sysconfdir}", [sysconfdir])
+AC_DEFINE_DIR(LIBDIR, "${libdir}", [libdir])
+AC_DEFINE_DIR(PREFIX, "$prefix", [install prefix])
+
+AS_AC_EXPAND(DATADIR, "${datadir}")
+AS_AC_EXPAND(PKGDATADIR, "${pkgdatadir}")
+AS_AC_EXPAND(PYTHONDIR, $pythondir)
+AS_AC_EXPAND(BUILDERDIR, $builderdir)
+
+AC_SUBST(VERSION)
+AC_SUBST(PACKAGE)
+AC_SUBST(PKGDATADIR)
+AC_SUBST(DATADIR)
+AC_SUBST(LIBDIR)
+AC_SUBST(PYTHONDIR)
+AC_SUBST(BUILDERDIR)
+
+dnl ***************************************************************************
+dnl *** Output Makefiles                                                    ***
+dnl ***************************************************************************
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
@@ -346,6 +440,10 @@ applets/Makefile
 applets/accessx-status/help/Makefile
 applets/accessx-status/Makefile
 applets/accessx-status/pixmaps/Makefile
+applets/battstat/apmlib/Makefile
+applets/battstat/help/Makefile
+applets/battstat/Makefile
+applets/battstat/sounds/Makefile
 applets/clock/Makefile
 applets/clock/pixmaps/Makefile
 applets/fish/Makefile
@@ -405,5 +503,6 @@ echo "
         Applets (from gnome-applets package):
             Building:
              - accessx-status          $HAVE_XKB
+             - battstat                $build_battstat_applet
 
 "
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index db342a2..85f01ab 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -16,10 +16,6 @@ if APPLET_MODEMLIGHTS
 modemlights_SUBDIRS = $(modemlights_applets)
 endif
 
-if BUILD_BATTSTAT_APPLET
-battstat_SUBDIR = battstat
-endif
-
 if BUILD_CPUFREQ_APPLET
 cpufreq_SUBDIR = cpufreq
 endif
@@ -48,7 +44,6 @@ SUBDIRS = \
        $(gtop_SUBDIRS)         \
        $(libgweather_SUBDIRS)  \
        $(vfs_SUBDIRS)          \
-       $(battstat_SUBDIR)      \
        $(invest_applet_SUBDIR) \
        $(cpufreq_SUBDIR) \
        $(mixer_applet_SUBDIR)
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index e69dbb3..e44be52 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -391,64 +391,6 @@ esac
 AM_CONDITIONAL(GKB_SUN, $gkb_type_sun)
 
 dnl ***************************************************************************
-dnl *** battstat specific checks                                            ***
-dnl ***************************************************************************
-
-dnl --disable-battstat=(yes|no)
-AC_ARG_ENABLE(battstat,
-             [  --disable-battstat=[@<:@no/yes@:>@]
-                          don't build battery monitor applet [@<:@default: no@:>@]],,
-             disable_battstat=no)
-
-HAVE_LIBAPM=no
-NEED_LIBAPM=no
-ACPIINC=
-build_battstat_applet=no
-
-if test x$disable_battstat = xno; then
-   build_battstat_applet=yes
-   AC_CHECK_HEADERS([err.h sys/sysctl.h])
-   case "${host}" in
-       powerpc-*-linux*)
-           NEED_LIBAPM=yes
-           AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
-          ;;
-       # list of supported OS cores that use libapm
-       *-*-linux*)
-          NEED_LIBAPM=yes
-          AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
-          ;;
-       # list of supported OS cores that do not use libapm
-       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
-          if [ -n "${OS_SYS}" ]; then
-              ACPIINC="-I${OS_SYS}"
-          else
-              ACPIINC="-I/usr/src/sys"
-          fi
-
-          savecppflags=$CPPFLAGS
-          CPPFLAGS="$CPPFLAGS $ACPIINC"
-          AC_CHECK_HEADER(dev/acpica/acpiio.h, have_acpiio=true, have_acpiio=false)
-          if test $have_acpiio = true; then
-            AC_DEFINE(HAVE_ACPIIO, 1, [Define if acpiio.h exists on the system])
-          fi
-
-          ;;
-       *)
-          echo "warning: ${host} is not supported by battstat_applet, not building" >&2
-          build_battstat_applet=no
-          ;;
-    esac
-fi
-
-AC_SUBST(HAVE_LIBAPM)
-AC_SUBST(NEED_LIBAPM)
-AC_SUBST(ACPIINC)
-AM_CONDITIONAL(HAVE_LIBAPM, test "x$HAVE_LIBAPM" = "xyes")
-AM_CONDITIONAL(NEED_LIBAPM, test "x$NEED_LIBAPM" = "xyes")
-AM_CONDITIONAL(BUILD_BATTSTAT_APPLET, test x$build_battstat_applet = xyes)
-
-dnl ***************************************************************************
 dnl *** Mini-Commander specific checks                                      ***
 dnl ***************************************************************************
 AC_ARG_ENABLE(mini-commander, [  --enable-mini-commander build mini-commander
@@ -623,50 +565,10 @@ dnl ***************************************************************************
 ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
 AC_SUBST(ACLOCAL_AMFLAGS)
 
-dnl ***************************************************************************
-dnl *** Set install directories                                             ***
-dnl ***************************************************************************
-iconsdir="${datadir}/icons"
-AC_SUBST(iconsdir)
-pixmapsdir="${datadir}/pixmaps"
-AC_SUBST(pixmapsdir)
-pkgdatadir="${datadir}/gnome-applets"
-AC_SUBST(pkgdatadir)
-builderdir="${pkgdatadir}/builder"
-AC_SUBST(builderdir)
-
-AC_DEFINE_DIR(GNOME_ICONDIR, "${iconsdir}", [Gnome Icon Directory])
-AC_DEFINE_DIR(GNOME_PIXMAPSDIR, "${pixmapsdir}", [Gnome Pixmaps Directory])
-AC_DEFINE_DIR(GTK_BUILDERDIR, "${builderdir}", [GtkBuilder Resources Directory])
-AC_DEFINE_DIR(DATADIR, "${datadir}", [datadir])
-AC_DEFINE_DIR(SYSCONFDIR, "${sysconfdir}", [sysconfdir])
-AC_DEFINE_DIR(LIBDIR, "${libdir}", [libdir])
-AC_DEFINE_DIR(PREFIX, "$prefix", [install prefix])
-
-AS_AC_EXPAND(DATADIR, "${datadir}")
-AS_AC_EXPAND(PKGDATADIR, "${pkgdatadir}")
-AS_AC_EXPAND(PYTHONDIR, $pythondir)
-AS_AC_EXPAND(BUILDERDIR, $builderdir)
-
-AC_SUBST(VERSION)
-AC_SUBST(PACKAGE)
-AC_SUBST(PKGDATADIR)
-AC_SUBST(DATADIR)
-AC_SUBST(LIBDIR)
-AC_SUBST(PYTHONDIR)
-AC_SUBST(BUILDERDIR)
-
-dnl ***************************************************************************
-dnl *** Output Makefiles et al                                              ***
-dnl ***************************************************************************
 AC_OUTPUT([
 gnome-applets.spec
 Makefile
 po/Makefile.in
-battstat/apmlib/Makefile
-battstat/help/Makefile
-battstat/Makefile
-battstat/sounds/Makefile
 charpick/help/Makefile
 charpick/Makefile
 cpufreq/help/Makefile
@@ -716,7 +618,6 @@ gnome-applets-$VERSION configure summary:
        Source code location:           ${srcdir}
        Compiler:                       ${CC}
 
-        - battstat                     $build_battstat_applet
         - charpick                     always
                - gucharmap support     $have_gucharmap
         - cpufreq                      $build_cpufreq_applet
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]