summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-01-08 18:21:49 +0100
committerinfirit <[email protected]>2014-01-09 00:23:46 +0100
commit6eeee715e1cf4734481c36e876696bf172d562cd (patch)
tree67bc388f6862b0d343753d8f64f125af342a4015 /configure.ac
parent5561a9a9080d218c8b935d133f7f50d9efc41d77 (diff)
downloadpython-caja-6eeee715e1cf4734481c36e876696bf172d562cd.tar.bz2
python-caja-6eeee715e1cf4734481c36e876696bf172d562cd.tar.xz
Fix distcheck so it works without root privilege
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac21
1 files changed, 14 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 1ca4590..84b70c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,14 +17,14 @@ dnl Check for pkgconfig first
AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-dnl Check for gtk-doc
-GTK_DOC_CHECK(1.9)
-
-dnl Give error and exit if we dont have pkgconfig
+dnl Give error and exit if we don't have pkgconfig
if test "x$HAVE_PKGCONFIG" = "xno"; then
AC_MSG_ERROR([you need to have pkgconfig installed !])
fi
+dnl Check for gtk-doc
+GTK_DOC_CHECK(1.9)
+
dnl **************************************************
dnl * Check for Python
dnl **************************************************
@@ -67,9 +67,16 @@ AC_DEFINE_UNQUOTED(CAJA_LIBDIR, "$CAJA_LIBDIR", [Caja libdir])
dnl ---------------------------------
dnl Get caja extensions directory
dnl ---------------------------------
-CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
-AC_SUBST(CAJA_EXTENSION_DIR)
-AC_DEFINE_UNQUOTED(CAJA_EXTENSION_DIR, "$CAJA_EXTENSION_DIR", [Caja extensions directory])
+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 ---------------------------------
dnl Check for gtk-doc dependencies