[libxslt] Fix LIBXSLT_DEFAULT_PLUGINS_PATH in xsltconfig.h



commit 698a23d4e5f94bfcde93af55e03552927d8020ad
Author: Nick Wellnhofer <wellnhofer aevum de>
Date:   Sun Dec 6 21:25:49 2015 +0100

    Fix LIBXSLT_DEFAULT_PLUGINS_PATH in xsltconfig.h
    
    Should fix #736204 for real.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=736204

 configure.in |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/configure.in b/configure.in
index e84ad4f..b49c1c8 100644
--- a/configure.in
+++ b/configure.in
@@ -618,7 +618,16 @@ AM_CONDITIONAL(WITH_MODULES, test "$WITH_MODULES" = "1")
 dnl
 dnl setup default module path
 dnl
-LIBXSLT_DEFAULT_PLUGINS_PATH="$libdir/libxslt-plugins"
+expanded_libdir=$(
+    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+    test "x$exec_prefix" = xNONE && exec_prefix="$prefix"
+    while test "$libdir_old" != "$libdir"; do
+      libdir_old="$libdir"
+      eval libdir="$libdir"
+    done
+    echo "$libdir"
+)
+LIBXSLT_DEFAULT_PLUGINS_PATH="$expanded_libdir/libxslt-plugins"
 AC_SUBST(LIBXSLT_DEFAULT_PLUGINS_PATH)
 
 WIN32_EXTRA_LIBADD=


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]