GNOME.org
 

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

commit 99e0bf47a91e49169f200ec330b8a398111b8e5b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed May 28 01:02:11 2014 +0300

    Fix stickynotes applet build

 applets/Makefile.am             |    1 +
 applets/stickynotes/Makefile.am |    8 ++++-
 configure.ac                    |   26 +++++++++++++++++++
 gnome-applets/Makefile.am       |    1 -
 gnome-applets/configure.ac      |   52 ---------------------------------------
 5 files changed, 33 insertions(+), 55 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index b969b3b..2872c69 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -7,6 +7,7 @@ SUBDIRS =                       \
        mini-commander \
        notification_area       \
        null_applet \
+       stickynotes     \
        wncklet
 
 if APPLET_ACCESSX
diff --git a/applets/stickynotes/Makefile.am b/applets/stickynotes/Makefile.am
index 4ac31b4..274ddb0 100644
--- a/applets/stickynotes/Makefile.am
+++ b/applets/stickynotes/Makefile.am
@@ -12,10 +12,13 @@ if BUILD_STICKYNOTES_APPLET
 AM_CPPFLAGS =                                  \
        -I.                                     \
        -I$(srcdir)                             \
-       $(GNOME_APPLETS_CFLAGS)                 \
+       $(LIBPANEL_APPLET_CFLAGS)                       \
        $(LIBWNCK_CFLAGS)                       \
        $(XML2_CFLAGS)                          \
        $(WARN_CFLAGS)                          \
+       -I$(srcdir)/../../libpanel-applet \
+       -I$(top_builddir)/libpanel-applet \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"\
        -DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/stickynotes/\"
 
@@ -34,7 +37,8 @@ stickynotes_applet_SOURCES = \
        stickynotes_applet_callbacks.c
 
 stickynotes_applet_LDADD =     \
-       $(GNOME_APPLETS_LIBS)   \
+       ../../libpanel-applet/libpanel-applet-4.la \
+       $(LIBPANEL_APPLET_LIBS) \
        $(LIBWNCK_LIBS)         \
        $(X_LIBS)               \
        $(XML2_LIBS)
diff --git a/configure.ac b/configure.ac
index 9ecb711..1ea270d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,7 @@ NETWORKMANAGER_REQUIRED=0.7
 LIBNOTIFY_REQUIRED=0.7
 GST10_REQUIRED=0.10.2
 LIBGTOP_REQUIRED=2.11.92
+LIBXML_REQUIRED=2.5.0
 
 dnl pkg-config dependency checks
 
@@ -354,6 +355,18 @@ if test "x$ENABLE_NETWORKMANAGER" = "xyes"; then
    fi
 fi
 
+dnl -- check for libxml2 (required) ------------------------------------------
+PKG_CHECK_MODULES(XML2, libxml-2.0 >= $LIBXML_REQUIRED)
+AC_SUBST(XML2_CFLAGS)
+AC_SUBST(XML2_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))
+
+AC_SUBST(LIBWNCK_CFLAGS)
+AC_SUBST(LIBWNCK_LIBS)
+
 dnl -- check for libgweather (required for gweather applet) ------------------
 build_libgweather_applets=false
 PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED,
@@ -680,6 +693,14 @@ AC_ARG_ENABLE(mini-commander, [  --enable-mini-commander build mini-commander
 AM_CONDITIONAL(BUILD_MINICOMMANDER_APPLET, test "x$enable_mini_commander" = "xyes")
 
 dnl ***************************************************************************
+dnl *** Stickynotes specific checks                                         ***
+dnl ***************************************************************************
+# AC_ARG_ENABLE(stickynotes, [  --enable-stickynotes build stickynotes
+#                           [@<:@default: no, transparent upgrade to Tomboy@:>@]], enable_stickynotes="yes", 
enable_stickynotes="no")
+enable_stickynotes="yes"
+AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes")
+
+dnl ***************************************************************************
 dnl *** invest-applet specific checks                                       ***
 dnl ***************************************************************************
 
@@ -780,6 +801,10 @@ applets/multiload/help/Makefile
 applets/multiload/Makefile
 applets/notification_area/Makefile
 applets/null_applet/Makefile
+applets/stickynotes/data/Makefile
+applets/stickynotes/help/Makefile
+applets/stickynotes/Makefile
+applets/stickynotes/pixmaps/Makefile
 applets/wncklet/Makefile
 doc/Makefile
 doc/reference/Makefile
@@ -851,6 +876,7 @@ echo "
              - modemlights             $BUILD_MODEM_LIGHTS
              - multiload               $build_gtop_applets
              - null_applet             always
+             - stickynotes             $enable_stickynotes
 
             Using DBUS:                $HAVE_DBUS
             Using NetworkManager:      $HAVE_NETWORKMANAGER
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index c9d83cb..c34790f 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -1,5 +1,4 @@
 always_built_SUBDIRS =  \
-       stickynotes     \
        trashapplet     \
 
 SUBDIRS = \
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index ce1c7b2..eef67d2 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -1,26 +1,10 @@
 dnl ***************************************************************************
-dnl *** configure.in for GNOME-APPLETS                                      ***
-dnl ***************************************************************************
-AC_INIT(gnome-applets, 3.7.1)
-AC_PREREQ(2.59)
-
-AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
-AC_CONFIG_MACRO_DIR(m4)
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-dnl ***************************************************************************
 dnl *** Minimum library versions for GNOME-APPLETS                          ***
 dnl ***************************************************************************
-GTK_REQUIRED=3.0
 GLIB_REQUIRED=2.22.0
 GIO_REQUIRED=2.15.3
-LIBPANEL_REQUIRED=2.91.90
-
 LIBXKLAVIER_REQUIRED=4.0
-LIBWNCK_REQUIRED=2.91.0
 GNOME_ICON_THEME_REQUIRED=2.15.91
-LIBXML_REQUIRED=2.5.0
 dnl ***************************************************************************
 
 AM_MAINTAINER_MODE
@@ -100,30 +84,6 @@ PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= $GIO_REQUIRED)
 AC_SUBST(GIO_UNIX_CFLAGS)
 AC_SUBST(GIO_UNIX_LIBS)
 
-dnl -- Check for GTK+ 3.0 (required) ------------------------------------------
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
-AC_SUBST(GTK_FLAGS)
-AC_SUBST(GTK_LIBS)
-
-dnl -- check for libpanelapplet (required) ------------------------------------
-PKG_CHECK_MODULES(GNOME_APPLETS, libpanelapplet-4.0 >= $LIBPANEL_REQUIRED)
-LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0`
-AC_SUBST(LIBPANEL_APPLET_DIR)
-AC_SUBST(GNOME_APPLETS_CFLAGS)
-AC_SUBST(GNOME_APPLETS_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))
-
-AC_SUBST(LIBWNCK_CFLAGS)
-AC_SUBST(LIBWNCK_LIBS)
-
-dnl -- check for libxml2 (required) ------------------------------------------
-PKG_CHECK_MODULES(XML2, libxml-2.0 >= $LIBXML_REQUIRED)
-AC_SUBST(XML2_CFLAGS)
-AC_SUBST(XML2_LIBS)
-
 dnl ***************************************************************************
 dnl *** find paths to installed binaries                                    ***
 dnl ***************************************************************************
@@ -186,13 +146,6 @@ case "$host" in
 esac
 AM_CONDITIONAL(GKB_SUN, $gkb_type_sun)
 
-dnl ***************************************************************************
-dnl *** Stickynotes specific checks                                         ***
-dnl ***************************************************************************
-# AC_ARG_ENABLE(stickynotes, [  --enable-stickynotes build stickynotes
-#                           [@<:@default: no, transparent upgrade to Tomboy@:>@]], enable_stickynotes="yes", 
enable_stickynotes="no")
-enable_stickynotes="yes"
-AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes")
 
 dnl ***************************************************************************
 dnl *** Check for getaddrinfo                                               ***
@@ -250,10 +203,6 @@ gnome-applets.spec
 Makefile
 po/Makefile.in
 man/Makefile
-stickynotes/data/Makefile
-stickynotes/help/Makefile
-stickynotes/Makefile
-stickynotes/pixmaps/Makefile
 trashapplet/help/Makefile
 trashapplet/Makefile
 trashapplet/src/Makefile
@@ -269,6 +218,5 @@ gnome-applets-$VERSION configure summary:
        Source code location:           ${srcdir}
        Compiler:                       ${CC}
 
-        - stickynotes                  $enable_stickynotes
         - trashapplet                  always
 " >&2
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]