[Xfce4-commits] <pyxfce:master> update automake config.

[Danny Milosavljevic]

Updating branch refs/heads/master
         to e41f8efd7133baa1ee85dbe3874c5e381d8d177b (commit)
       from 09cea4d95731956d9a23ed96ae90d4c85e3f64ae (commit)

commit e41f8efd7133baa1ee85dbe3874c5e381d8d177b
Author: Danny Milosavljevic <dannym at xfce.org>
Date:   Thu Dec 16 18:43:02 2010 +0100

    update automake config.

 Makefile.am           |    4 ++--
 configure.ac          |    4 +---
 examples/configure.ac |    2 --
 pyxfce-1.0.pc.in      |    1 +
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 93d76c1..a642c1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,8 +13,8 @@ if HAVE_MIGHTY_MOUSE
 SUBDIR_MIGHTY_MOUSE = panel
 endif
 
-SUBDIRS = gui mcs netk util $(SUBDIR_MIGHTY_MOUSE)
-DIST_SUBDIRS = gui mcs netk util $(SUBDIR_MIGHTY_MOUSE)
+SUBDIRS = gui netk util $(SUBDIR_MIGHTY_MOUSE)
+DIST_SUBDIRS = gui netk util $(SUBDIR_MIGHTY_MOUSE)
 
 PLATFORM_VERSION = 4.2
 PLATFORM_WIN32 =
diff --git a/configure.ac b/configure.ac
index d0e505e..fee8f0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 -*- mode: m4 -*-
 AC_PREREQ(2.52)
+AC_CONFIG_MACRO_DIR([m4])
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -57,8 +58,6 @@ dnl XFCE_MIGHTY_MOUSE_PANEL_PLUGIN([PANEL], [4.3])
 dnl PANEL_EXTERNALPLUGINDIR
 dnl PANEL_DESKTOPDATADIR
 
-BM_DEPEND([XFCE4_MCS_CLIENT], [libxfce4mcs-client-1.0], [4.1.0])
-BM_DEPEND([XFCE4_MCS_MANAGER], [libxfce4mcs-manager-1.0], [4.1.0])
 BM_DEPEND([GTK], [gtk+-2.0], [2.4])
 BM_DEPEND([PYGTK], [pygtk-2.0], [2.6.0])
 
@@ -86,7 +85,6 @@ AC_CONFIG_FILES(
   Makefile
   pyxfce-1.0.pc
   gui/Makefile
-  mcs/Makefile
   netk/Makefile
   panel/Makefile
   util/Makefile
diff --git a/examples/configure.ac b/examples/configure.ac
index 52ea38c..66a0542 100644
--- a/examples/configure.ac
+++ b/examples/configure.ac
@@ -37,8 +37,6 @@ XFCE_MIGHTY_MOUSE_PANEL_PLUGIN([PANEL], [4.3])
 dnl PANEL_EXTERNALPLUGINDIR
 dnl PANEL_DESKTOPDATADIR
 
-BM_DEPEND([XFCE4_MCS_CLIENT], [libxfce4mcs-client-1.0], [4.1.0])
-BM_DEPEND([XFCE4_MCS_MANAGER], [libxfce4mcs-manager-1.0], [4.1.0])
 dnl BM_DEPEND([GTK], [gtk+-2.0], [2.4])
 dnl BM_DEPEND([PYGTK], [pygtk-2.0], [2.6.0])
 
diff --git a/pyxfce-1.0.pc.in b/pyxfce-1.0.pc.in
index 11a37d9..2509e1b 100644
--- a/pyxfce-1.0.pc.in
+++ b/pyxfce-1.0.pc.in
@@ -1,4 +1,5 @@
 prefix=@prefix@
+datarootdir=@datarootdir@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
 datadir=@datadir@