[gnome-panel/merge-gnome-applets] Add modemlights applet, but it will not build

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

commit f7ca4fefa332cd18ad174a99917fce0beb02a01c
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed May 28 00:34:25 2014 +0300

    Add modemlights applet, but it will not build

 applets/Makefile.am             |    4 +++
 applets/modemlights/Makefile.am |    8 +++++-
 configure.ac                    |   40 +++++++++++++++++++++++++++++++++++++++
 gnome-applets/Makefile.am       |    8 -------
 gnome-applets/configure.ac      |   40 ---------------------------------------
 5 files changed, 50 insertions(+), 50 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index e0c2e69..977eccf 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -28,4 +28,8 @@ if BUILD_INVEST_APPLET
 SUBDIRS += invest-applet
 endif
 
+if APPLET_MODEMLIGHTS
+SUBDIRS += modemlights
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/applets/modemlights/Makefile.am b/applets/modemlights/Makefile.am
index f1b8efd..8be8016 100644
--- a/applets/modemlights/Makefile.am
+++ b/applets/modemlights/Makefile.am
@@ -1,8 +1,11 @@
 #SUBDIRS = help
 
 AM_CPPFLAGS = -I. -I$(srcdir)                          \
+       -I$(srcdir)/../../libpanel-applet \
+       -I$(top_builddir)/libpanel-applet \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DMODEM_MENU_UI_DIR=\""$(uidir)"\"              \
-       $(GNOME_APPLETS_CFLAGS)                         \
+       $(LIBPANEL_APPLET_CFLAGS) \
        $(WARN_CFLAGS)
 
 libexec_PROGRAMS = modem_applet
@@ -12,7 +15,8 @@ modem_applet_SOURCES = \
        modem-applet.h
 
 modem_applet_LDADD =           \
-       $(GNOME_APPLETS_LIBS)   \
+       ../../libpanel-applet/libpanel-applet-4.la \
+       $(LIBPANEL_APPLET_LIBS) \
        $(MODEMLIGHTS_LIBS)
 
 uidir  = $(datadir)/gnome-2.0/ui
diff --git a/configure.ac b/configure.ac
index c7680a4..3bc47a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -441,6 +441,17 @@ AC_SUBST(LIBM)
 dnl -- check for Python/GNOME modules (optional) ------------------------------
 PKG_CHECK_MODULES(PYGOBJECT, pygobject-3.0, HAVE_PYGOBJECT="yes", HAVE_PYGOBJECT="no")
 
+dnl -- check for gnome-settings-daemon (optional) -----------------------------
+PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, gnome-settings-daemon,
+       HAVE_GNOME_SETTINGS_DAEMON=yes, HAVE_GNOME_SETTINGS_DAEMON=no)
+
+if test "x$HAVE_GNOME_SETTINGS_DAEMON" = "xno"; then
+       AC_MSG_WARN([gnome-settings-daemon DBUS API is required to build modem-applet.])
+fi
+
+AC_SUBST(GNOME_SETTINGS_DAEMON_CFLAGS)
+AC_SUBST(GNOME_SETTINGS_DAEMON_LIBS)
+
 dnl -- check for gucharmap (optional) -----------------------------------------
 
 PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED],
@@ -603,6 +614,33 @@ AM_CONDITIONAL(NEED_LIBAPM, test "x$NEED_LIBAPM" = "xyes")
 AM_CONDITIONAL(BUILD_BATTSTAT_APPLET, test x$build_battstat_applet = xyes)
 
 dnl ***************************************************************************
+dnl *** modemlights applet check                                            ***
+dnl ***************************************************************************
+
+SU_TOOL=
+HAVE_LIBUTIL=
+
+AC_PATH_PROG(SU_TOOL, su)
+AC_CHECK_LIB(util, forkpty, HAVE_LIBUTIL=true, HAVE_LIBUTIL=false)
+
+dnl ***
+dnl *** Modem lights does not currently compile. It needs to be ported to a
+dnl *** modern gnome-system-tools backend.
+dnl ***
+dnl if test "x$HAVE_LIBUTIL" = "xtrue" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
+dnl   MODEMLIGHTS_LIBS=" -lutil"
+dnl   AC_SUBST(MODEMLIGHTS_LIBS)
+dnl   AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR, "$STB_SCRIPTS_DIR", [System tools backends])
+dnl   AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path])
+dnl   BUILD_MODEM_LIGHTS=yes
+dnl else
+  AC_MSG_WARN([*** modemlights applet will not be built ***])
+  BUILD_MODEM_LIGHTS=no
+dnl fi
+
+AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
+
+dnl ***************************************************************************
 dnl *** Mini-Commander specific checks                                      ***
 dnl ***************************************************************************
 AC_ARG_ENABLE(mini-commander, [  --enable-mini-commander build mini-commander
@@ -703,6 +741,7 @@ applets/invest-applet/Makefile
 applets/mini-commander/help/Makefile
 applets/mini-commander/Makefile
 applets/mini-commander/src/Makefile
+applets/modemlights/Makefile
 applets/notification_area/Makefile
 applets/wncklet/Makefile
 doc/Makefile
@@ -771,6 +810,7 @@ echo "
              - gweather                $build_libgweather_applets
              - invest-applet           $HAVE_PYGOBJECT
              - mini-commander          $enable_mini_commander
+             - modemlights             $BUILD_MODEM_LIGHTS
 
             Using DBUS:                $HAVE_DBUS
             Using NetworkManager:      $HAVE_NETWORKMANAGER
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index 334207f..3689d81 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -4,12 +4,6 @@ if BUILD_GTOP_APPLETS
 gtop_SUBDIRS = $(gtop_applets)
 endif
 
-modemlights_applets = \
-       modemlights
-if APPLET_MODEMLIGHTS
-modemlights_SUBDIRS = $(modemlights_applets)
-endif
-
 if BUILD_MIXER_APPLET
 mixer_applet_SUBDIR = mixer
 endif
@@ -22,7 +16,6 @@ always_built_SUBDIRS =  \
 SUBDIRS = \
        po                      \
        $(always_built_SUBDIRS) \
-       $(modemlights_SUBDIRS)  \
        $(gtop_SUBDIRS)         \
        $(libgweather_SUBDIRS)  \
        $(vfs_SUBDIRS)          \
@@ -31,7 +24,6 @@ SUBDIRS = \
 
 DIST_SUBDIRS = \
        po              \
-       modemlights     \
        drivemount      \
        charpick        \
        geyes           \
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index 6bc06ac..2c9a525 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -123,17 +123,6 @@ AC_SUBST(GTOP_APPLETS_CFLAGS)
 AC_SUBST(GTOP_APPLETS_LIBS)
 AM_CONDITIONAL(BUILD_GTOP_APPLETS, $build_gtop_applets)
 
-dnl -- check for gnome-settings-daemon (optional) -----------------------------
-PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, gnome-settings-daemon,
-       HAVE_GNOME_SETTINGS_DAEMON=yes, HAVE_GNOME_SETTINGS_DAEMON=no)
-
-if test "x$HAVE_GNOME_SETTINGS_DAEMON" = "xno"; then
-       AC_MSG_WARN([gnome-settings-daemon DBUS API is required to build modem-applet.])
-fi
-
-AC_SUBST(GNOME_SETTINGS_DAEMON_CFLAGS)
-AC_SUBST(GNOME_SETTINGS_DAEMON_LIBS)
-
 dnl -- check for libwnck (required) -------------------------------------------
 PKG_CHECK_MODULES(LIBWNCK, libwnck-3.0 >= $LIBWNCK_REQUIRED,,
        AC_MSG_ERROR([libwnck is required to build gnome-applets.], 1))
@@ -237,33 +226,6 @@ enable_stickynotes="yes"
 AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes")
 
 dnl ***************************************************************************
-dnl *** modemlights applet check                                            ***
-dnl ***************************************************************************
-
-SU_TOOL=
-HAVE_LIBUTIL=
-
-AC_PATH_PROG(SU_TOOL, su)
-AC_CHECK_LIB(util, forkpty, HAVE_LIBUTIL=true, HAVE_LIBUTIL=false)
-
-dnl ***
-dnl *** Modem lights does not currently compile. It needs to be ported to a
-dnl *** modern gnome-system-tools backend.
-dnl ***
-dnl if test "x$HAVE_LIBUTIL" = "xtrue" -a "x$HAVE_GNOME_SETTINGS_DAEMON" = "xyes"; then
-dnl   MODEMLIGHTS_LIBS=" -lutil"
-dnl   AC_SUBST(MODEMLIGHTS_LIBS)
-dnl   AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR, "$STB_SCRIPTS_DIR", [System tools backends])
-dnl   AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path])
-dnl   BUILD_MODEM_LIGHTS=yes
-dnl else
-  AC_MSG_WARN([*** modemlights applet will not be built ***])
-  BUILD_MODEM_LIGHTS=no
-dnl fi
-
-AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
-
-dnl ***************************************************************************
 dnl *** Check for getaddrinfo                                               ***
 dnl ***************************************************************************
 have_getaddrinfo=no
@@ -321,7 +283,6 @@ po/Makefile.in
 man/Makefile
 mixer/help/Makefile
 mixer/Makefile
-modemlights/Makefile
 multiload/help/Makefile
 multiload/Makefile
 null_applet/Makefile
@@ -344,7 +305,6 @@ gnome-applets-$VERSION configure summary:
        Source code location:           ${srcdir}
        Compiler:                       ${CC}
 
-        - modemlights                  $BUILD_MODEM_LIGHTS
         - mixer                        $enable_mixer
         - multiload                    $build_gtop_applets
         - stickynotes                  $enable_stickynotes