diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2009-04-27 16:06:43 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2009-04-27 16:25:05 +0200 |
| commit | ecdc91693c8d4f1385ac5919aef6e5b4513c6534 (patch) | |
| tree | 3fcc08bad7e432057c3189c01e06dab73f334984 | |
| parent | 4f21a995a67bcdf54a0874416f920232d936f9de (diff) | |
| download | gnome-disk-utility-ecdc91693c8d4f1385ac5919aef6e5b4513c6534.tar.gz gnome-disk-utility-ecdc91693c8d4f1385ac5919aef6e5b4513c6534.tar.xz gnome-disk-utility-ecdc91693c8d4f1385ac5919aef6e5b4513c6534.zip | |
nautilus extension: make automake dependency soft (optional)
This ensures the package to be built without nautilus sources.
The nautilus extension then can have separate distribution package/ebuild.
| -rw-r--r-- | configure.ac | 28 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gdu-nautilus-extension/Makefile.am | 2 |
3 files changed, 33 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 7486019..07ce6ad 100644 --- a/configure.ac +++ b/configure.ac @@ -128,6 +128,7 @@ GTK2_REQUIRED=2.6.0 LIBSEXY_REQUIRED=0.1.11 UNIQUE_REQUIRED=1.0 LIBNOTIFY_REQUIRED=0.3.0 +NAUTILUS_REQUIRED=2.24.0 SCROLLKEEPER_REQUIRED=0.3.14 INTLTOOL_REQUIRED=0.35.0 @@ -136,6 +137,7 @@ PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(GOBJECT2, gobject-2.0 >= $GOBJECT2_REQUIRED) PKG_CHECK_MODULES(GIO2, gio-2.0 >= $GIO2_REQUIRED) PKG_CHECK_MODULES(GIO_UNIX2, gio-unix-2.0 >= $GIO2_REQUIRED) +PKG_CHECK_MODULES(GTHREAD2, gthread-2.0 >= $GLIB2_REQUIRED) PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= $DBUS_GLIB_REQUIRED) PKG_CHECK_MODULES(POLKIT_DBUS, polkit-dbus >= $POLKIT_DBUS_REQUIRED) PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_GNOME_REQUIRED) @@ -165,6 +167,31 @@ AC_SUBST([GETTEXT_PACKAGE]) AM_GLIB_GNU_GETTEXT AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain]) +# ****************** +# Nautilus extension +# ****************** + +have_nautilus=no +AC_ARG_ENABLE(nautilus, AC_HELP_STRING([--disable-nautilus], [disable nautilus extension])) + +if test "x$enable_nautilus" != "xno"; then + PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED, + [AC_DEFINE(HAVE_NAUTILUS, 1, [Define if nautilus is available]) + have_nautilus=yes], have_nautilus=no) + if test "x$have_nautilus" = xno -a "x$enable_nautilus" = xyes; then + AC_MSG_ERROR([nautilus support requested but libraries not found]) + fi + + dnl Get nautilus extensions directory + NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` +fi + +AC_SUBST(NAUTILUS_LIBS) +AC_SUBST(NAUTILUS_CFLAGS) +AC_SUBST(NAUTILUS_EXTENSION_DIR) + +AM_CONDITIONAL(ENABLE_NAUTILUS, [test "$have_nautilus" = "yes"]) + # ************************************* # ************************************* @@ -220,4 +247,5 @@ echo " Maintainer mode: ${USE_MAINTAINER_MODE} Building api docs: ${enable_gtk_doc} + Nautilus extension: ${have_nautilus} " diff --git a/src/Makefile.am b/src/Makefile.am index d561249..fdf6b20 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,8 @@ -SUBDIRS = gdu gdu-gtk palimpsest notification playground gdu-format-tool gdu-nautilus-extension +SUBDIRS = gdu gdu-gtk palimpsest notification playground gdu-format-tool + +if ENABLE_NAUTILUS +SUBDIRS += gdu-nautilus-extension +endif clean-local : rm -f *~ diff --git a/src/gdu-nautilus-extension/Makefile.am b/src/gdu-nautilus-extension/Makefile.am index d4b77c5..ce47ae7 100644 --- a/src/gdu-nautilus-extension/Makefile.am +++ b/src/gdu-nautilus-extension/Makefile.am @@ -38,7 +38,6 @@ CORE_LIBADD = \ $(NULL) -if ENABLE_NAUTILUS nautilus_extensiondir = $(NAUTILUS_EXTENSION_DIR) nautilus_extension_LTLIBRARIES = libnautilus-gdu.la @@ -50,4 +49,3 @@ libnautilus_gdu_la_SOURCES = \ libnautilus_gdu_la_CPPFLAGS = $(CORE_CFLAGS) $(NAUTILUS_CFLAGS) -DG_LOG_DOMAIN=\"Nautilus-GDU\" libnautilus_gdu_la_LDFLAGS = $(AM_LDFLAGS) -export_dynamic -module -avoid-version -no-undefined libnautilus_gdu_la_LIBADD = $(CORE_LIBADD) $(NAUTILUS_LIBS) -endif |