applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Put common in always_built_SUBDIRS

Browse source 
2001-10-18  Bradford Hovinen  <hovinen@ximian.com>

	* capplets/Makefile.am (always_built_SUBDIRS): Put common in
	always_built_SUBDIRS

	* configure.in (dnl): Remove --enable-bonobo-conf option
This commit is contained in:
Bradford Hovinen 2001-10-19 03:23:23 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 4b9ca59ec9
commit df78191ec2
3 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2001-10-18 Bradford Hovinen <hovinen@ximian.com>
* capplets/Makefile.am (always_built_SUBDIRS): Put common in
always_built_SUBDIRS
* configure.in (dnl): Remove --enable-bonobo-conf option
2001-10-11 Israel Escalante <israel@ximian.com> 2001-10-11 Israel Escalante <israel@ximian.com>
* configure.in: Bump version to 1.5.10 * configure.in: Bump version to 1.5.10

4
capplets/Makefile.am
View file

@ -1,7 +1,7 @@
always_built_SUBDIRS = \ always_built_SUBDIRS = \
background keyboard mouse screensaver sound \ common background keyboard mouse screensaver sound \
default-applications desktop-links default-applications desktop-links
#rollback #rollback
SUBDIRS = $(LIBCOMMON_DIR) $(always_built_SUBDIRS) SUBDIRS = $(always_built_SUBDIRS)

18
configure.in
View file

@ -88,8 +88,6 @@ fi
dnl ============================================== dnl ==============================================
dnl Check for pkg-config dnl Check for pkg-config
dnl ============================================== dnl ==============================================
dnl ============================================== dnl ==============================================
dnl Check for --enable-bonobo-conf option dnl Check for --enable-bonobo-conf option
dnl ============================================== dnl ==============================================
@ -117,25 +115,17 @@ LIBCOMMON_DIR=
moniker_enable= moniker_enable=
fi fi
AC_SUBST(LIBCOMMON_DIR)
AM_CONDITIONAL(BONOBO_CONF_ENABLE, test "x$bonobo_conf_enable" = "xyes")
AM_CONDITIONAL(LIBCOMMON_ENABLE, test "x$libcommon_enable" = "xyes")
AM_CONDITIONAL(MONIKER_ENABLE, test "x$moniker_enable" = "xyes")
dnl ============================================== dnl ==============================================
dnl Check that we meet the dependencies dnl Check that we meet the dependencies
dnl ============================================== dnl ==============================================
capplet_modules="libcapplet >= 1.5.4 libglade-gnome gdk_pixbuf gdk_pixbuf_xlib gal >= 0.12" capplet_modules="libcapplet >= 1.5.4 libglade-gnome gdk_pixbuf gdk_pixbuf_xlib gal >= 0.12"
PKG_CHECK_MODULES(CAPPLET, $capplet_modules $PKG_BONOBO_CONF_CHECK) PKG_CHECK_MODULES(CAPPLET, $capplet_modules bonobo bonobo_conf >= 0.12)
PKG_CHECK_MODULES(GNOMECC, gnomeui libglade xml gdk_pixbuf gnomecanvaspixbuf $PKG_BONOBO_CHECK gtkhtml >= 0.15.0) PKG_CHECK_MODULES(GNOMECC, gnomeui libglade xml gdk_pixbuf gnomecanvaspixbuf bonobo bonobox gtkhtml >= 0.15.0)
PKG_CHECK_MODULES(RMHELPER, gnomeui gnomecanvaspixbuf) PKG_CHECK_MODULES(RMHELPER, gnomeui gnomecanvaspixbuf)
PKG_CHECK_MODULES(ARCHIVER, $PKG_BONOBO_CONF_CHECK xml) PKG_CHECK_MODULES(ARCHIVER, bonobo bonobo_conf >= 0.12 xml)
PKG_CHECK_MODULES(CONFIG_ARCHIVER, bonobo gnome xml) PKG_CHECK_MODULES(CONFIG_ARCHIVER, bonobo gnome xml)
PKG_CHECK_MODULES(MONIKER, bonobo bonobo_conf >= 0.12 xml)
if test "x$moniker_enable" = "xyes"; then
PKG_CHECK_MODULES(MONIKER, $PKG_BONOBO_CONF_CHECK xml)
fi
AC_PATH_PROG(XSCREENSAVER, xscreensaver, no) AC_PATH_PROG(XSCREENSAVER, xscreensaver, no)
if test "$XSCREENSAVER" = no ; then if test "$XSCREENSAVER" = no ; then