Skip to content
Permalink
Browse files

Use CAJA_EXTENSION_DIR_SYS to save and show system caja extension dir

Here just show message, so a new variable used to save and show.
Remove fallback caja_extension_dir set, pkg check libcaja-extension
before, so this is not needed.
  • Loading branch information...
yetist authored and raveit65 committed Feb 28, 2019
1 parent fdc25dc commit 5fdcb1711f67e549f7aeb2fd77c84cbb39375224
Showing with 3 additions and 7 deletions.
  1. +3 −7 configure.ac
@@ -81,20 +81,16 @@ 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_SYS=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR_SYS#`$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='caja/extensions-2.0'
custom_caja_extension_dir=false
fi

if test x$custom_caja_extension_dir = xtrue; then
AC_MSG_RESULT([${CAJA_EXTENSION_DIR}])
else
AC_MSG_RESULT([${libdir}/${CAJA_EXTENSION_DIR}])
AC_MSG_RESULT([${CAJA_EXTENSION_DIR_SYS}])
fi
AM_CONDITIONAL([CUSTOM_CAJA_EXTENSION_DIR], [test x$custom_caja_extension_dir = xtrue])
AC_SUBST(CAJA_EXTENSION_DIR)

0 comments on commit 5fdcb17

Please sign in to comment.
You can’t perform that action at this time.