Permalink
Browse files

applied patch from Joel Reed to ease plugin integration Daniel

* configure.in libxslt/Makefile.am libxslt/xsltconfig.h.in
  libxslt.spec.in tests/plugins/Makefile.am xslt-config.in: applied
  patch from Joel Reed to ease plugin integration
Daniel
  • Loading branch information...
1 parent a46f814 commit 67232e9682e74fc129ad771bfdf98ddc4f50e061 Daniel Veillard committed Oct 2, 2005
Showing with 28 additions and 13 deletions.
  1. +6 −0 ChangeLog
  2. +1 −1 configure.in
  3. +1 −0 libxslt.spec.in
  4. +3 −0 libxslt/Makefile.am
  5. +1 −1 libxslt/xsltconfig.h.in
  6. +10 −11 tests/plugins/Makefile.am
  7. +6 −0 xslt-config.in
View
@@ -1,3 +1,9 @@
+Sun Oct 2 11:52:44 CEST 2005 Daniel Veillard <daniel@veillard.com>
+
+ * configure.in libxslt/Makefile.am libxslt/xsltconfig.h.in
+ libxslt.spec.in tests/plugins/Makefile.am xslt-config.in: applied
+ patch from Joel Reed to ease plugin integration
+
Thu Sep 22 21:51:22 HKT 2005 William Brack <wbrack@mmm.com.hk>
* libxslt/pattern.c: fixed problem in internal XPath compilation
View
@@ -480,7 +480,7 @@ dnl setup default module path
dnl
module_prefix=$prefix
test "x$module_prefix" = xNONE && module_prefix=$ac_default_prefix
-LIBXSLT_DEFAULT_PLUGINS_PATH="\"$module_prefix/lib/libxslt/$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION\""
+LIBXSLT_DEFAULT_PLUGINS_PATH="$module_prefix/lib/libxslt-plugins"
AC_SUBST(LIBXSLT_DEFAULT_PLUGINS_PATH)
dnl
View
@@ -85,6 +85,7 @@ rm -fr %{buildroot}
%doc doc/EXSLT
%doc %{_mandir}/man1/xsltproc.1*
%{_libdir}/lib*.so.*
+%{_libdir}/libxslt-plugins
%{prefix}/bin/xsltproc
%files devel
View
@@ -59,3 +59,6 @@ EXTRA_DIST = $(man_MANS) trio.h triodef.h
xsltproc: all
@(cd ../xsltproc ; $(MAKE))
+
+install-exec-hook:
+ $(mkinstalldirs) "$(libdir)/libxslt-plugins"
View
@@ -116,7 +116,7 @@ extern "C" {
#ifndef WITH_MODULES
#define WITH_MODULES
#endif
-#define LIBXSLT_DEFAULT_PLUGINS_PATH() @LIBXSLT_DEFAULT_PLUGINS_PATH@
+#define LIBXSLT_DEFAULT_PLUGINS_PATH() "@LIBXSLT_DEFAULT_PLUGINS_PATH@"
#endif
/**
View
@@ -1,35 +1,34 @@
## Process this file with automake to produce Makefile.in
-# somewhat unconventional pkglibdir, but noinst_LTLIBRARIES
-# never build DSOs (afaik). NOTE: must be defined outside the AM_CONDITIONAL
-pkglibdir=$(shell pwd)/plugin
-
$(top_builddir)/xsltproc/xsltproc:
@(cd ../../../xsltproc ; $(MAKE) xsltproc)
EXTRA_DIST = plugin.out plugin.xml plugin.xsl
INCLUDES = -I$(top_srcdir) -I../../libxslt $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
-noinst_LTLIBRARIES = xmlsoft_org_xslt_testplugin.la
+EXTRA_LTLIBRARIES = xmlsoft_org_xslt_testplugin.la
+
+# our rpath is a rather unorthodox location as we
+# don't want to pollute $(DESTDIR) with the test plugin
+
+plugindir=$(shell pwd)/.libs/
xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
-xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version
+xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version -rpath $(plugindir)
all:
if WITH_MODULES
test-logall:
@echo '## Running plugin tests'
- @echo '## Note: installing xmlsoft_org_xslt_testplugin.so'
- @echo '## to $(pkglibdir)'
-test tests: $(top_builddir)/xsltproc/xsltproc test-logall install-pkglibLTLIBRARIES
- @LD_LIBRARY_PATH=$(top_builddir)/libxslt/.libs:$(LD_LIBRARY_PATH) \
- LIBXSLT_PLUGINS_PATH=./plugin \
+test tests: $(top_builddir)/xsltproc/xsltproc test-logall $(EXTRA_LTLIBRARIES)
+ @LD_LIBRARY_PATH=$(plugindir):$(top_builddir)/libxslt/.libs:$(LD_LIBRARY_PATH) \
+ LIBXSLT_PLUGINS_PATH=$(plugindir) \
$(top_builddir)/xsltproc/xsltproc plugin.xsl plugin.xml > plugin.res
@diff plugin.out plugin.res
@rm plugin.res
View
@@ -17,6 +17,7 @@ Known values for OPTION are:
--exec-prefix=DIR change XSLT executable prefix [default $exec_prefix]
--libs print library linking information
--cflags print pre-processor and compiler flags
+ --plugins print plugin directory
--help display this help and exit
--version output version information
EOF
@@ -63,6 +64,11 @@ while test $# -gt 0; do
exit 0
;;
+ --plugins)
+ echo @LIBXSLT_DEFAULT_PLUGINS_PATH@
+ exit 0
+ ;;
+
--help)
usage 0
;;

0 comments on commit 67232e9

Please sign in to comment.