X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=320612d47f1e11e3feaeecb295243aa8b7920bd5;hb=369ce2e964c0092b9d6e873f80e2468c4c3d8013;hp=4ffa56a71402f4a9649b81d990bbba40eb35dd22;hpb=59b1b2c33a2d03ba81282169f01a6c1d0a3226a5;p=evince.git

diff --git a/configure.ac b/configure.ac
index 4ffa56a7..320612d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,6 @@ fi
 
 AM_CONDITIONAL([PLATFORM_HILDON],[test "$with_platform" = "hildon"])
 AM_CONDITIONAL([PLATFORM_WIN32],[test "with_platform" = "win32"])
-AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
 
 dnl Specify required versions of dependencies
 DBUS_GLIB_REQUIRED=0.70
@@ -325,7 +324,7 @@ AC_SUBST(FRONTEND_LIBS)
 
 # Check for Nautilus property page build
 AC_ARG_ENABLE([nautilus],
-  [AS_HELP_STRING([--enable-nautilus],[compile the nautilus plugin])],
+  [AS_HELP_STRING([--disable-nautilus],[Build the nautilus extensions])],
   [],
   [case "$with_platform" in
      gnome) enable_nautilus=yes ;;
@@ -333,7 +332,8 @@ AC_ARG_ENABLE([nautilus],
     esac])
 
 if test "$enable_nautilus" = "yes" ; then
-  PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension])
+  PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension],
+                    [],[AC_MSG_ERROR([libnautilus-extension not found; use --disable-nautilus to disable the nautilus extensions])])
   NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
   AC_SUBST([nautilusextensiondir],[$NAUTILUS_EXTENSION_DIR])
   AC_SUBST(NAUTILUS_CFLAGS)