From 8d268d4f7dbdfb66b66880ea4cdf81a756396bf4 Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Fri, 18 Oct 2013 17:51:25 +0200
Subject: Fix distcheck so it can run without root privilage

---
 Makefile.am  |  3 ++-
 configure.ac | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 514a751..40554c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,8 @@ DISTCLEANFILES =                        \
 	intltool-merge                  \
 	intltool-update
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+DISTCHECK_CONFIGURE_FLAGS = --with-cajadir='$${libdir}/caja/extensions-2.0-distcheck'
+
 
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
diff --git a/configure.ac b/configure.ac
index b41ea5d..22e7a89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,8 +170,17 @@ AC_SUBST(DISABLE_DEPRECATED)
 dnl ******************************
 
 
-CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
-AC_SUBST(CAJA_EXTENSION_DIR)
+AC_ARG_WITH(cajadir,
+        AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]),
+        [ac_with_cajadir=$withval],
+        [ac_with_cajadir=""])
+if test "${ac_with_cajadir}" = ""; then
+        ac_with_cajadir=`pkg-config --variable=extensiondir libcaja-extension`
+fi
+
+AC_MSG_NOTICE([installing caja plugin in ${ac_with_cajadir}])
+AC_SUBST([CAJA_EXTENSION_DIR],[${ac_with_cajadir}])
+
 
 dnl ******************************
 
-- 
cgit v1.2.1