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

Use external (and optional) libslab

Browse source
This commit is contained in:
Rodrigo Moya 2009-06-29 13:03:56 +02:00
parent 1e58245df0
commit c223dafe32
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile.am
View file

@ -1,4 +1,8 @@
SUBDIRS = po libwindow-settings libslab capplets font-viewer shell help SUBDIRS = po libwindow-settings capplets font-viewer help
if HAVE_LIBSLAB
SUBDIRS += shell
endif
if HAVE_TYPING_BREAK if HAVE_TYPING_BREAK
SUBDIRS += typing-break SUBDIRS += typing-break

18
configure.in
View file

@ -87,16 +87,12 @@ dnl ==============================================
dnl Check that we meet the dependencies dnl Check that we meet the dependencies
dnl ============================================== dnl ==============================================
ENABLE_DYNAMIC_LIBSLAB=0
AM_CONDITIONAL(ENABLE_DYNAMIC_LIBSLAB, test "x$ENABLE_DYNAMIC_LIBSLAB" = "x1")
COMMON_MODULES="gtk+-2.0 >= 2.13.1 dnl COMMON_MODULES="gtk+-2.0 >= 2.13.1 dnl
glib-2.0 >= 2.17.4 dnl glib-2.0 >= 2.17.4 dnl
gio-2.0 dnl gio-2.0 dnl
gconf-2.0 dnl gconf-2.0 dnl
libglade-2.0 >= 2.0.0 dnl libglade-2.0 >= 2.0.0 dnl
gnome-desktop-2.0 >= 2.25.1" gnome-desktop-2.0 >= 2.25.1"
PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES libgnomeui-2.0 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango libgnomeui-2.0)
PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1) PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnomeui-2.0 libgnome-menu libpanelapplet-2.0) PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnomeui-2.0 libgnome-menu libpanelapplet-2.0)
@ -113,6 +109,18 @@ gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
GTK_ENGINE_DIR="$gtk_lib_dir/gtk-2.0/$gtk_binary_version/engines" GTK_ENGINE_DIR="$gtk_lib_dir/gtk-2.0/$gtk_binary_version/engines"
AC_SUBST(GTK_ENGINE_DIR) AC_SUBST(GTK_ENGINE_DIR)
dnl
dnl Check if we have libslab
dnl
PKG_CHECK_MODULES(LIBSLAB, [
libslab libgnomeui-2.0 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango libgnomeui-2.0
],
have_libslab=yes,
have_libslab=no)
AC_SUBST(LIBSLAB_CFLAGS)
AC_SUBST(LIBSLAB_LIBS)
AM_CONDITIONAL(HAVE_LIBSLAB, test "x$have_libslab"="xyes")
dnl dnl
dnl Check for Xft version 2; we build in extra functionality to the font capplet dnl Check for Xft version 2; we build in extra functionality to the font capplet
dnl when we have it. dnl when we have it.
@ -313,8 +321,6 @@ capplets/windows/window-properties.desktop.in
font-viewer/Makefile font-viewer/Makefile
font-viewer/gnome-font-viewer.desktop.in font-viewer/gnome-font-viewer.desktop.in
help/Makefile help/Makefile
libslab/Makefile
libslab/libslab.pc
libwindow-settings/Makefile libwindow-settings/Makefile
libwindow-settings/gnome-window-settings-2.0.pc libwindow-settings/gnome-window-settings-2.0.pc
po/Makefile.in po/Makefile.in