2006-03-20 Benedikt Meurer <benny@xfce.org>

	* Makefile.am, acinclude.m4, configure.in.in, po/POTFILES.in,
	  po/Thunar.pot, plugins/: Move thunar-uca to plugins/.




(Old svn revision: 20508)

ChangeLog

+2006-03-20	Benedikt Meurer <benny@xfce.org>
+
+	* Makefile.am, acinclude.m4, configure.in.in, po/POTFILES.in,
+	  po/Thunar.pot, plugins/: Move thunar-uca to plugins/.
+
 2006-03-20	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-icon-renderer.c(thunar_icon_renderer_render): Render

Makefile.am

 # $Id$
 
-if ENABLE_UCA_PLUGIN
-SUBDIRS_THUNAR_UCA = thunar-uca
-endif
-
 SUBDIRS =								\
 	icons								\
 	pixmaps								\
@@ -16,7 +12,7 @@ SUBDIRS =								\
 	tests								\
 	docs								\
 	examples							\
-	$(SUBDIRS_THUNAR_UCA)
+	plugins
 
 AUTOMAKE_OPTIONS =							\
 	1.8								\

acinclude.m4

@@ -8,6 +8,22 @@ dnl
 
 
 
+dnl # BM_THUNAR_PLUGIN_UCA()
+dnl #
+dnl # Check whether the "User Customizable Actions" plugin
+dnl # should be built and installed.
+dnl #
+AC_DEFUN([BM_THUNAR_PLUGIN_UCA],
+[
+AC_ARG_ENABLE([uca-plugin], AC_HELP_STRING([--disable-uca-plugin], [Don't build the thunar-uca plugin, see plugins/thunar-uca/README]),
+  [ac_bm_thunar_plugin_uca=$enable_val], [ac_bm_thunar_plugin_uca=yes])
+AC_MSG_CHECKING([whether to build the thunar-uca plugin])
+AM_CONDITIONAL([THUNAR_PLUGIN_UCA], [test x"$ac_bm_thunar_plugin_uca" = x"yes"])
+AC_MSG_RESULT([$ac_bm_thunar_plugin_uca])
+])
+
+
+
 dnl # BM_THUNAR_VFS_MONITOR_IMPL()
 dnl #
 dnl # Determine the file system monitoring to use for

configure.in.in

@@ -338,14 +338,10 @@ AC_MSG_CHECKING([PLATFORM_LDFLAGS])
 AC_MSG_RESULT([$PLATFORM_LDFLAGS])
 AC_SUBST([PLATFORM_LDFLAGS])
 
-dnl *****************************************
-dnl *** Check whether to build UCA plugin ***
-dnl *****************************************
-AC_ARG_ENABLE([uca-plugin], AC_HELP_STRING([--disable-uca-plugin], [Don't build the thunar-uca plugin, see thunar-uca/README]),
-  [], [enable_uca_plugin=yes])
-AC_MSG_CHECKING([whether to build the thunar-uca plugin])
-AM_CONDITIONAL([ENABLE_UCA_PLUGIN], [test x"$enable_uca_plugin" = x"yes"])
-AC_MSG_RESULT([$enable_uca_plugin])
+dnl ************************************
+dnl *** Check for additional plugins ***
+dnl ************************************
+BM_THUNAR_PLUGIN_UCA()
 
 AC_OUTPUT([
 Makefile
@@ -371,15 +367,16 @@ icons/16x16/Makefile
 icons/24x24/Makefile
 icons/48x48/Makefile
 icons/scalable/Makefile
+pixmaps/Makefile
+plugins/Makefile
+plugins/thunar-uca/Makefile
 po/Makefile.in
 po-doc/Makefile
 tdb/Makefile
 tdb/tdbconfig.h
-pixmaps/Makefile
 tests/Makefile
 tests/data/Makefile
 thunar/Makefile
-thunar-uca/Makefile
 thunar-vfs/Makefile
 thunar-vfs/thunar-vfs-1.pc
 thunar-vfs/thunar-vfs-config.h
@@ -395,21 +392,24 @@ echo
 echo "Build Configuration:"
 echo
 if test x"$DBUS_FOUND" = x"yes"; then
-echo "* D-BUS support:        yes"
+echo "* D-BUS support:             yes"
 else
-echo "* D-BUS support:        no"
+echo "* D-BUS support:             no"
 fi
-echo "* File System Monitor:  $ac_bm_thunar_vfs_monitor_impl"
+echo "* File System Monitor:       $ac_bm_thunar_vfs_monitor_impl"
 if test x"$GCONF_FOUND" = x"yes"; then
-echo "* GNOME Thumbnailers:   yes"
+echo "* GNOME Thumbnailers:        yes"
 else
-echo "* GNOME Thumbnailers:   no"
+echo "* GNOME Thumbnailers:        no"
 fi
 if test x"$LIBSTARTUP_NOTIFICATION_FOUND" = x"yes"; then
-echo "* Startup Notification: yes"
+echo "* Startup Notification:      yes"
 else
-echo "* Startup Notification: no"
+echo "* Startup Notification:      no"
 fi
-echo "* Volume Manager:       $ac_bm_thunar_vfs_volume_impl"
+echo "* Volume Manager:            $ac_bm_thunar_vfs_volume_impl"
+echo
+echo "Additional Plugins:"
+echo
+echo "* User Customizable Actions: $ac_bm_thunar_plugin_uca"
 echo
-

plugins/Makefile.am

+# $Id$
+
+if THUNAR_PLUGIN_UCA
+THUNAR_UCA_SUBDIRS = thunar-uca
+endif
+
+SUBDIRS =								\
+	$(THUNAR_UCA_SUBDIRS)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

thunar-uca/Makefile.am → plugins/thunar-uca/Makefile.am

@@ -2,7 +2,9 @@
 
 INCLUDES =								\
 	-I$(top_builddir)						\
+	-I$(top_builddir)/plugins					\
 	-I$(top_srcdir)							\
+	-I$(top_srcdir)/plugins						\
 	-DBINDIR=\"$(bindir)\"						\
 	-DDATADIR=\"$(datadir)\"					\
 	-DEXO_API_SUBJECT_TO_CHANGE					\

po/POTFILES.in

@@ -91,18 +91,18 @@ thunar/thunar-window.c
 thunarx/thunarx-property-page.c
 thunarx/thunarx-provider-plugin.c
 
-thunar-uca/thunar-uca-chooser.c
-thunar-uca/thunar-uca-chooser.h
-thunar-uca/thunar-uca-context.c
-thunar-uca/thunar-uca-context.h
-thunar-uca/thunar-uca-editor.c
-thunar-uca/thunar-uca-editor.h
-thunar-uca/thunar-uca-model.c
-thunar-uca/thunar-uca-model.h
-thunar-uca/thunar-uca-plugin.c
-thunar-uca/thunar-uca-provider.c
-thunar-uca/thunar-uca-provider.h
-thunar-uca/uca.xml.in
+plugins/thunar-uca/thunar-uca-chooser.c
+plugins/thunar-uca/thunar-uca-chooser.h
+plugins/thunar-uca/thunar-uca-context.c
+plugins/thunar-uca/thunar-uca-context.h
+plugins/thunar-uca/thunar-uca-editor.c
+plugins/thunar-uca/thunar-uca-editor.h
+plugins/thunar-uca/thunar-uca-model.c
+plugins/thunar-uca/thunar-uca-model.h
+plugins/thunar-uca/thunar-uca-plugin.c
+plugins/thunar-uca/thunar-uca-provider.c
+plugins/thunar-uca/thunar-uca-provider.h
+plugins/thunar-uca/uca.xml.in
 
 Thunar.desktop.in
 Thunar-folder-handler.desktop.in