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

add code to conditionally enable the compilation of the about-me capplet

Browse Source 
2005-06-22  Diego Gonzalez <diego@pemas.net>

    * configure.in: add code to conditionally enable the compilation of the about-me capplet
    * capplets/Makefile.am: ditto
This commit is contained in:
Diego Gonzalez
2005-06-23 12:45:39 +00:00
committed by Diego González
parent e14b196cec
commit 7e3b5d1756
3 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2005-06-22 Diego Gonzalez <diego@pemas.net>
* configure.in: add code to conditionally enable the compilation of
the about-me capplet
* capplets/Makefile.am: ditto
2005-06-12 Sebastien Bacher <seb128@debian.org>
* configure.in: update to 2.11.5

10
capplets/Makefile.am
View File

@@ -11,7 +11,13 @@ else
randr_SUBDIRS =
endif
SUBDIRS = $(always_built_SUBDIRS) $(randr_SUBDIRS)
if BUILD_ABOUTME
aboutme_SUBDIRS = about-me
else
aboutme_SUBDIRS =
endif
SUBDIRS = $(always_built_SUBDIRS) $(randr_SUBDIRS) $(aboutme_SUBDIRS)
DIST_SUBDIRS = \
$(always_built_SUBDIRS) display
$(always_built_SUBDIRS) display $(aboutme_SUBDIRS)

33
configure.in
View File

@@ -252,6 +252,37 @@ if test x$enable_vfs_methods = xyes; then
fi
fi
dnl ==============================================
dnl About-me
dnl ==============================================
AC_ARG_ENABLE(aboutme,
AC_HELP_STRING([--enable-aboutme],
[Enable about-me capplet]),,
enable_aboutme=no)
if test "x$enable_aboutme" = "xyes"; then
LIBEBOOK_REQUIREMENT="libebook-1.2 >= 1.3.0"
AC_MSG_CHECKING(for evolution-data-server)
if $PKG_CONFIG --exists libebook-1.2; then
AC_MSG_RESULT(yes)
LIBEBOOK_REQUIREMENT="libebook-1.2 >= 1.3.0"
AC_DEFINE(BUILD_ABOUTME, 1, Build the about-me capplet)
PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2)
fi
else
AC_MSG_RESULT(no)
fi
if test -n "$LIBEBOOK_REQUIREMENT"; then
AC_DEFINE([HAVE_LIBEBOOK], 1,
[Defined when evolution-data-server libebook-1.2 is detected])
fi
AM_CONDITIONAL(BUILD_ABOUTME, test -n "$LIBEBOOK_REQUIREMENT")
AM_CONDITIONAL(HAVE_LIBEBOOK, test -n "$LIBEBOOK_REQUIREMENT")
dnl ==============================================
dnl End: Check that we meet the dependencies
dnl ==============================================
@@ -512,6 +543,7 @@ capplets/accessibility/keyboard/Makefile
capplets/accessibility/at-properties/Makefile
capplets/network/Makefile
capplets/windows/Makefile
capplets/about-me/Makefile
typing-break/Makefile
schemas/Makefile
libsounds/Makefile
@@ -535,6 +567,7 @@ capplets/ui-properties/gnome-ui-properties.desktop.in
capplets/network/gnome-network-preferences.desktop.in
capplets/windows/window-properties.desktop.in
capplets/keyboard/keyboard.desktop.in
capplets/about-me/gnome-about-me.desktop.in
control-center/gnomecc.desktop.in
])