diff -ru nautilus-2.20.0.exempi/configure.in nautilus-2.20.0/configure.in --- nautilus-2.20.0.exempi/configure.in 2008-01-15 18:55:50.669640000 -0500 +++ nautilus-2.20.0/configure.in 2008-01-16 02:42:49.370211570 -0500 @@ -260,18 +260,26 @@ dnl ========================================================================== +AM_CONDITIONAL(HAVE_EXEMPI, false) +AM_CONDITIONAL(HAVE_EXEMPI_NEW_API, false) + 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)]) +AC_ARG_ENABLE(exempi, [ --disable-exempi build without exempi support]) +msg_exempi=no + if test "x$enable_exempi" != "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_exempi=yes, [AM_CONDITIONAL(HAVE_EXEMPI, false)]) -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) + 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 @@ -502,6 +510,7 @@ prefix: ${prefix} source code location: ${srcdir} compiler: ${CC} + exempi support: $msg_exempi tracker support: $msg_tracker beagle support: $msg_beagle