diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-07-21 15:11:20 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-07-21 15:11:20 +0000 |
| commit | 1ceeed0fc031e52c0aeb59947fee79ffbab3368f (patch) | |
| tree | e48dbfd4116078abb62f926c1c91cc00c3c4183b | |
| parent | 838b12f0f416c59c98924a3e70672235bc344298 (diff) | |
| download | nautilus-1ceeed0fc031e52c0aeb59947fee79ffbab3368f.tar.gz | |
Allow to disable XMP support. Thanks to Mikel Olasagasti and Gilles
2008-07-21 Christian Neumair <cneumair@gnome.org>
* configure.in:
Allow to disable XMP support. Thanks to Mikel Olasagasti and Gilles
Dartiguelongue.
svn path=/trunk/; revision=14387
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 35 |
2 files changed, 31 insertions, 10 deletions
@@ -1,5 +1,11 @@ 2008-07-21 Christian Neumair <cneumair@gnome.org> + * configure.in: + Allow to disable XMP support. Thanks to Mikel Olasagasti and Gilles + Dartiguelongue. + +2008-07-21 Christian Neumair <cneumair@gnome.org> + * libnautilus-private/nautilus-file-private.h: * libnautilus-private/nautilus-file.c (update_info_internal), (nautilus_file_get_trash_original_file): diff --git a/configure.in b/configure.in index 5ab1451f9..9726a49d4 100644 --- a/configure.in +++ b/configure.in @@ -255,16 +255,26 @@ dnl ========================================================================== dnl exempi checking -PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [ - AM_CONDITIONAL(HAVE_EXEMPI, true) - AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable XMP support]) - ], [AM_CONDITIONAL(HAVE_EXEMPI, false)]) +AM_CONDITIONAL(HAVE_EXEMPI, false) + +AC_ARG_ENABLE(xmp, + AC_HELP_STRING([--disable-xmp], + [build without xmp support])) +msg_xmp=no +if test "x$enable_xmp" != "xno"; then + PKG_CHECK_MODULES(EXEMPI, exempi-2.0 >= exempi_minver, [ + AM_CONDITIONAL(HAVE_EXEMPI, true) + AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable xmp support]) + ] + msg_xmp=yes, + [AM_CONDITIONAL(HAVE_EXEMPI, false)]) -PKG_CHECK_MODULES(EXEMPI_NEW_API, exempi-2.0 >= exempi_minver_newapi, + PKG_CHECK_MODULES(EXEMPI_NEW_API, exempi-2.0 >= exempi_minver_newapi, AC_DEFINE(HAVE_EXEMPI_NEW_API, 1, [Define if we have exempi with the new API]), true) -AC_SUBST(EXEMPI_CFLAGS) -AC_SUBST(EXEMPI_LIBS) + AC_SUBST(EXEMPI_CFLAGS) + AC_SUBST(EXEMPI_LIBS) +fi dnl ========================================================================== dnl search implementations @@ -274,7 +284,9 @@ AM_CONDITIONAL(HAVE_TRACKER, false) dnl libtracker checking -AC_ARG_ENABLE(tracker, [ --disable-tracker build without tracker support]) +AC_ARG_ENABLE(tracker, + AC_HELP_STRING([--disable-tracker], + [build without tracker support])) msg_tracker=no if test "x$enable_tracker" != "xno"; then PKG_CHECK_MODULES(TRACKER, tracker >= tracker_minver, [ @@ -293,8 +305,10 @@ dnl ========================================================================== AM_CONDITIONAL(HAVE_BEAGLE, false) dnl libbeagle checking - -AC_ARG_ENABLE(beagle, [ --disable-beagle build without beagle support]) + +AC_ARG_ENABLE(beagle, + AC_HELP_STRING([--disable-beagle], + [build without beagle support])) msg_beagle=no if test "x$enable_beagle" != "xno"; then BEAGLE_PKGCONFIG= @@ -501,6 +515,7 @@ nautilus-$VERSION: compiler: ${CC} tracker support: $msg_tracker beagle support: $msg_beagle + xmp support: $msg_xmp profiling support: ${profiling_support} nautilus-extension documentation: ${enable_gtk_doc} |