summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 37440e8..2a4b411 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,14 +79,20 @@ AC_ARG_WITH(caja-extension-dir,
AC_MSG_CHECKING([for caja extension directory])
if test -n "$with_caja_extension_dir"; then
CAJA_EXTENSION_DIR=$with_caja_extension_dir
+ custom_caja_extension_dir=true
else
CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
+ CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR#`$PKG_CONFIG --variable=libdir libcaja-extension`}
+ CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR#/}
+ custom_caja_extension_dir=false
fi
if test -z "$CAJA_EXTENSION_DIR"; then
- CAJA_EXTENSION_DIR='${exec_prefix}/lib/caja/extensions-2.0'
+ CAJA_EXTENSION_DIR='caja/extensions-2.0'
+ custom_caja_extension_dir=false
fi
AC_MSG_RESULT([${CAJA_EXTENSION_DIR}])
+AM_CONDITIONAL([CUSTOM_CAJA_EXTENSION_DIR], [test x$custom_caja_extension_dir = xtrue])
AC_SUBST(CAJA_EXTENSION_DIR)
CAJA_VERSION=`$PKG_CONFIG --modversion libcaja-extension`