From c1611ee87da956b8c6a5c8a99ebcc8d6701a0ad8 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 16 Nov 2004 08:58:45 +0000 Subject: [PATCH] require libgnome-menu for the shell, fixup other shell requirements and 2004-11-10 Mark McLoughlin * configure.in: require libgnome-menu for the shell, fixup other shell requirements and don't look for libnautilus anymore. * Makefile.am: don't install control-center2.png anymore. * control-center2.png: remove. --- ChangeLog | 10 ++++++++++ Makefile.am | 3 --- configure.in | 8 +------- control-center2.png | Bin 3464 -> 0 bytes 4 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 control-center2.png diff --git a/ChangeLog b/ChangeLog index 29692c702..544578310 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-11-10 Mark McLoughlin + + * configure.in: require libgnome-menu for the shell, fixup + other shell requirements and don't look for libnautilus + anymore. + + * Makefile.am: don't install control-center2.png anymore. + + * control-center2.png: remove. + 2004-11-09 Mark McLoughlin * configure.in: remove $GNOMECC_DESKTOP_DIR diff --git a/Makefile.am b/Makefile.am index 669415722..e00b87873 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,9 +8,6 @@ SUBDIRS = po libsounds libbackground libwindow-settings libgswitchit libkbdraw g # in the configure.in file. Since we are not using it now, i will # remove it from the default build. Chema -pixmapdir = $(datadir)/pixmaps -pixmap_DATA = control-center2.png - dist-hook: control-center.spec cp control-center.spec $(distdir) diff --git a/configure.in b/configure.in index 0cbbca37d..b8e83695f 100644 --- a/configure.in +++ b/configure.in @@ -90,7 +90,7 @@ dnl ============================================== COMMON_MODULES="gtk+-2.0 >= 2.3.0 gconf-2.0 libgnomeui-2.0 >= 2.2.0 libglade-2.0 >= 1.99.12 libbonobo-2.0 libbonoboui-2.0 libglade-2.0 gconf-2.0 gnome-desktop-2.0 >= 2.2.0" PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) -PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libxml-2.0 gnome-desktop-2.0 gnome-vfs-2.0) +PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.9.1) PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, gtk+-2.0 gconf-2.0 libgnomeui-2.0 esound gnome-desktop-2.0 libglade-2.0) PKG_CHECK_MODULES(OLD_CAPPLET, libgnomeui-2.0 libglade-2.0) PKG_CHECK_MODULES(GNOME, libgnomeui-2.0) @@ -261,11 +261,6 @@ AC_SUBST(LIBBONOBO_IDL_DIR) BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`" AC_SUBST(BONOBO_ACTIVATION_IDL_DIR) -# check for nautilus -PKG_CHECK_MODULES(NAUTILUS, libnautilus) -AC_SUBST(NAUTILUS_LIBS) -AC_SUBST(NAUTILUS_CFLAGS) - # esd ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound` if test x"$ESDSERVERDIR" = x; then @@ -517,7 +512,6 @@ gnome-settings-daemon/Makefile gnome-settings-daemon/xrdb/Makefile gnome-settings-daemon/actions/Makefile control-center/Makefile -control-center/GNOME_ControlCenter.server libbackground/Makefile libwindow-settings/Makefile libwindow-settings/gnome-window-settings-2.0.pc diff --git a/control-center2.png b/control-center2.png deleted file mode 100644 index ef385746a2c3a8003e6b91b2ac9021eb5a191f6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3464 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