diff options
| author | Wu Xiaotian <[email protected]> | 2019-02-28 10:46:53 +0800 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-03-06 16:43:18 +0100 |
| commit | 54ea50e5984fb97876bcd55cc8764d3d02f7394a (patch) | |
| tree | 35452e92daeb1bdb3d648049917a8b64deebc451 | |
| parent | a041c1dca3f565616a5ef4dd1bc47910c013b580 (diff) | |
| download | caja-dropbox-54ea50e5984fb97876bcd55cc8764d3d02f7394a.tar.bz2 caja-dropbox-54ea50e5984fb97876bcd55cc8764d3d02f7394a.tar.xz | |
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.
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 5f061f7..7b63336 100644 --- a/configure.ac +++ b/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) |