[tracker] Remove all tracker-applet references from autofoo.
- From: Carlos Garnacho <carlosg src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker] Remove all tracker-applet references from autofoo.
- Date: Tue, 8 Sep 2009 11:42:04 +0000 (UTC)
commit 3ba77de31dfe52565eff2180d282f04754b16dca
Author: Carlos Garnacho <carlos lanedo com>
Date: Tue Sep 8 13:26:12 2009 +0200
Remove all tracker-applet references from autofoo.
configure.ac | 34 +++++++++++++++++-----------------
data/Makefile.am | 2 +-
docs/manpages/Makefile.am | 2 +-
src/Makefile.am | 2 +-
src/tracker-status-icon/Makefile.am | 4 ++--
5 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 71b229f..b4ee349 100644
--- a/configure.ac
+++ b/configure.ac
@@ -746,38 +746,38 @@ fi
AM_CONDITIONAL(HAVE_LIBTRACKERGTK, test "$have_libtrackergtk" = "yes")
##################################################################
-# Enable building tracker-applet notification icon?
+# Enable building tracker-status-icon notification icon?
##################################################################
-AC_ARG_ENABLE([tracker-applet],
- AS_HELP_STRING([--enable-tracker-applet],
- [enable tracker-applet [[default=auto]]]),,
- [enable_tracker_applet=auto])
+AC_ARG_ENABLE([tracker-status-icon],
+ AS_HELP_STRING([--enable-tracker-status-icon],
+ [enable tracker-status-icon [[default=auto]]]),,
+ [enable_tracker_status_icon=auto])
-if test "x$enable_tracker_applet" != "xno" ; then
- PKG_CHECK_MODULES(TRACKER_APPLET, [
+if test "x$enable_tracker_status_icon" != "xno" ; then
+ PKG_CHECK_MODULES(TRACKER_STATUS_ICON, [
glib-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-1 >= $DBUS_REQUIRED
dbus-glib-1 >= $DBUS_REQUIRED
libnotify >= $LIBNOTIFY_REQUIRED],
- [have_tracker_applet=yes],
- [have_tracker_applet=no])
+ [have_tracker_status_icon=yes],
+ [have_tracker_status_icon=no])
- AC_SUBST([TRACKER_APPLET_CFLAGS])
- AC_SUBST([TRACKER_APPLET_LIBS])
+ AC_SUBST([TRACKER_STATUS_ICON_CFLAGS])
+ AC_SUBST([TRACKER_STATUS_ICON_LIBS])
else
- have_tracker_applet="no (disabled)"
+ have_tracker_status_icon="no (disabled)"
fi
-if test "x$enable_tracker_applet" = "xyes"; then
- if test "x$have_tracker_applet" != "xyes"; then
- AC_MSG_ERROR([Couldn't find tracker-applet dependencies (glib-2.0 >= $GLIB_REQUIRED, gtk+-2.0 >= $GTK_REQUIRED, dbus-1 >= $DBUS_REQUIRED, dbus-glib-1 >= $DBUS_REQUIRED, libnotify >= $LIBNOTIFY_REQUIRED).])
+if test "x$enable_tracker_status_icon" = "xyes"; then
+ if test "x$have_tracker_status_icon" != "xyes"; then
+ AC_MSG_ERROR([Couldn't find tracker-status-icon dependencies (glib-2.0 >= $GLIB_REQUIRED, gtk+-2.0 >= $GTK_REQUIRED, dbus-1 >= $DBUS_REQUIRED, dbus-glib-1 >= $DBUS_REQUIRED, libnotify >= $LIBNOTIFY_REQUIRED).])
fi
fi
-AM_CONDITIONAL(HAVE_TRACKER_APPLET, test "$have_tracker_applet" = "yes")
+AM_CONDITIONAL(HAVE_TRACKER_STATUS_ICON, test "$have_tracker_status_icon" = "yes")
AC_ARG_ENABLE([tracker-explorer],
AS_HELP_STRING([--enable-tracker-explorer],
@@ -1468,7 +1468,7 @@ Applications:
Build deskbar-applet: $have_deskbar_applet
Build tracker-search-tool: $have_tracker_search_tool
Build tracker-preferences: $have_tracker_preferences
- Build tracker-applet: $have_tracker_applet
+ Build tracker-status-icon: $have_tracker_status_icon
Build libtracker-gtk: $have_libtrackergtk
Build tracker-explorer: $have_tracker_explorer
diff --git a/data/Makefile.am b/data/Makefile.am
index 39e95c3..47278bf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -30,7 +30,7 @@ autostart_DATA = \
tracker-store.desktop \
tracker-miner-fs.desktop
-if HAVE_TRACKER_APPLET
+if HAVE_TRACKER_STATUS_ICON
autostart_DATA += tracker-status-icon.desktop
endif
diff --git a/docs/manpages/Makefile.am b/docs/manpages/Makefile.am
index 4401925..8553920 100644
--- a/docs/manpages/Makefile.am
+++ b/docs/manpages/Makefile.am
@@ -4,7 +4,7 @@ if HAVE_TRACKER_SEARCH_TOOL
tst = tracker-search-tool.1
endif
-if HAVE_TRACKER_APPLET
+if HAVE_TRACKER_STATUS_ICON
ta = tracker-applet.1
endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ef213d..88811f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ if HAVE_TRACKER_PREFERENCES
# SUBDIRS += tracker-preferences
endif
-if HAVE_TRACKER_APPLET
+if HAVE_TRACKER_STATUS_ICON
SUBDIRS += tracker-status-icon
endif
diff --git a/src/tracker-status-icon/Makefile.am b/src/tracker-status-icon/Makefile.am
index 694fc88..fb999f3 100644
--- a/src/tracker-status-icon/Makefile.am
+++ b/src/tracker-status-icon/Makefile.am
@@ -8,14 +8,14 @@ INCLUDES = \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
- $(TRACKER_APPLET_CFLAGS) \
+ $(TRACKER_STATUS_ICON_CFLAGS) \
$(GCOV_CFLAGS)
bin_PROGRAMS = tracker-status-icon
tracker_status_icon_LDADD = \
$(top_builddir)/src/libtracker-miner/libtracker-miner.la \
- $(TRACKER_APPLET_LIBS) \
+ $(TRACKER_STATUS_ICON_LIBS) \
$(GCOV_LIBS)
tracker_status_icon_SOURCES = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]