diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | doc/libxslt-api.xml | 128 | ||||
| -rw-r--r-- | libxslt.spec.in | 19 | ||||
| -rw-r--r-- | python/Makefile.am | 5 | ||||
| -rw-r--r-- | xsltproc/xsltproc.c | 4 |
6 files changed, 84 insertions, 86 deletions
@@ -1,3 +1,9 @@ +Thu May 15 16:26:34 EDT 2003 Daniel Veillard <daniel@veillard.com> + + * xsltproc/xsltproc.c: fixing portability bug #113002 on HP-UX + * configure.in libxslt.spec.in python/Makefile.am: cleanup + of --with-python like for libxml2 + Thu May 15 11:45:00 HKT 2003 William Brack <wbrack@mmm.com.hk> * libxslt/xsltutils.c: fixing bug #112995, a problem with diff --git a/configure.in b/configure.in index 25513155..ea9b1407 100644 --- a/configure.in +++ b/configure.in @@ -151,6 +151,7 @@ PYTHON= PYTHON_VERSION= PYTHON_INCLUDES= PYTHON_SITE_PACKAGES= +pythondir= AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found]) if test "$with_python" != "no" ; then if test -x "$with_python/bin/python" @@ -206,6 +207,12 @@ except: print 0"` fi fi fi + if test "$with_python" != "" + then + pythondir='$(PYTHON_SITE_PACKAGES)' + else + pythondir='$(libdir)/python${PYTHON_VERSION}/site-packages' + fi fi AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") if test "$PYTHON_INCLUDES" != "" @@ -214,6 +221,7 @@ then else PYTHON_SUBDIR= fi +AC_SUBST(pythondir) AC_SUBST(PYTHON_SUBDIR) dnl diff --git a/doc/libxslt-api.xml b/doc/libxslt-api.xml index 3c16033c..68c1c8cf 100644 --- a/doc/libxslt-api.xml +++ b/doc/libxslt-api.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <api name='libxslt'> <files> - <file name='documents'> - <exports symbol='xsltFindDocument'/> - <exports symbol='xsltFreeDocuments'/> - <exports symbol='xsltFreeStyleDocuments'/> - <exports symbol='xsltLoadDocument'/> - <exports symbol='xsltLoadStyleDocument'/> - <exports symbol='xsltNewDocument'/> - <exports symbol='xsltNewStyleDocument'/> + <file name='extra'> + <exports symbol='XSLT_LIBXSLT_NAMESPACE'/> + <exports symbol='XSLT_NORM_SAXON_NAMESPACE'/> + <exports symbol='XSLT_SAXON_NAMESPACE'/> + <exports symbol='XSLT_XALAN_NAMESPACE'/> + <exports symbol='XSLT_XT_NAMESPACE'/> + <exports symbol='xsltDebug'/> + <exports symbol='xsltFunctionNodeSet'/> + <exports symbol='xsltRegisterAllExtras'/> + <exports symbol='xsltRegisterExtras'/> </file> <file name='imports'> <exports symbol='XSLT_GET_IMPORT_INT'/> @@ -20,40 +22,11 @@ <exports symbol='xsltParseStylesheetImport'/> <exports symbol='xsltParseStylesheetInclude'/> </file> - <file name='security'> - <exports symbol='XSLT_SECPREF_CREATE_DIRECTORY'/> - <exports symbol='XSLT_SECPREF_READ_FILE'/> - <exports symbol='XSLT_SECPREF_READ_NETWORK'/> - <exports symbol='XSLT_SECPREF_WRITE_FILE'/> - <exports symbol='XSLT_SECPREF_WRITE_NETWORK'/> - <exports symbol='xsltCheckRead'/> - <exports symbol='xsltCheckWrite'/> - <exports symbol='xsltFreeSecurityPrefs'/> - <exports symbol='xsltGetDefaultSecurityPrefs'/> - <exports symbol='xsltGetSecurityPrefs'/> - <exports symbol='xsltNewSecurityPrefs'/> - <exports symbol='xsltSecurityAllow'/> - <exports symbol='xsltSecurityCheck'/> - <exports symbol='xsltSecurityForbid'/> - <exports symbol='xsltSecurityOption'/> - <exports symbol='xsltSecurityPrefs'/> - <exports symbol='xsltSecurityPrefsPtr'/> - <exports symbol='xsltSetCtxtSecurityPrefs'/> - <exports symbol='xsltSetDefaultSecurityPrefs'/> - <exports symbol='xsltSetSecurityPrefs'/> - </file> - <file name='templates'> - <exports symbol='xsltAttrListTemplateProcess'/> - <exports symbol='xsltAttrTemplateProcess'/> - <exports symbol='xsltAttrTemplateValueProcess'/> - <exports symbol='xsltAttrTemplateValueProcessNode'/> - <exports symbol='xsltEvalAttrValueTemplate'/> - <exports symbol='xsltEvalStaticAttrValueTemplate'/> - <exports symbol='xsltEvalTemplateString'/> - <exports symbol='xsltEvalXPathPredicate'/> - <exports symbol='xsltEvalXPathString'/> - <exports symbol='xsltEvalXPathStringNs'/> - <exports symbol='xsltTemplateProcess'/> + <file name='preproc'> + <exports symbol='xsltDocumentComp'/> + <exports symbol='xsltExtMarker'/> + <exports symbol='xsltFreeStylePreComps'/> + <exports symbol='xsltStylePreCompute'/> </file> <file name='xsltutils'> <exports symbol='IS_XSLT_ELEM'/> @@ -122,24 +95,49 @@ <exports symbol='xsltUnparsedEntityURIFunction'/> <exports symbol='xsltXPathFunctionLookup'/> </file> - <file name='namespaces'> - <exports symbol='xsltCopyNamespace'/> - <exports symbol='xsltCopyNamespaceList'/> - <exports symbol='xsltFreeNamespaceAliasHashes'/> - <exports symbol='xsltGetNamespace'/> - <exports symbol='xsltGetSpecialNamespace'/> - <exports symbol='xsltNamespaceAlias'/> + <file name='security'> + <exports symbol='XSLT_SECPREF_CREATE_DIRECTORY'/> + <exports symbol='XSLT_SECPREF_READ_FILE'/> + <exports symbol='XSLT_SECPREF_READ_NETWORK'/> + <exports symbol='XSLT_SECPREF_WRITE_FILE'/> + <exports symbol='XSLT_SECPREF_WRITE_NETWORK'/> + <exports symbol='xsltCheckRead'/> + <exports symbol='xsltCheckWrite'/> + <exports symbol='xsltFreeSecurityPrefs'/> + <exports symbol='xsltGetDefaultSecurityPrefs'/> + <exports symbol='xsltGetSecurityPrefs'/> + <exports symbol='xsltNewSecurityPrefs'/> + <exports symbol='xsltSecurityAllow'/> + <exports symbol='xsltSecurityCheck'/> + <exports symbol='xsltSecurityForbid'/> + <exports symbol='xsltSecurityOption'/> + <exports symbol='xsltSecurityPrefs'/> + <exports symbol='xsltSecurityPrefsPtr'/> + <exports symbol='xsltSetCtxtSecurityPrefs'/> + <exports symbol='xsltSetDefaultSecurityPrefs'/> + <exports symbol='xsltSetSecurityPrefs'/> </file> - <file name='extra'> - <exports symbol='XSLT_LIBXSLT_NAMESPACE'/> - <exports symbol='XSLT_NORM_SAXON_NAMESPACE'/> - <exports symbol='XSLT_SAXON_NAMESPACE'/> - <exports symbol='XSLT_XALAN_NAMESPACE'/> - <exports symbol='XSLT_XT_NAMESPACE'/> - <exports symbol='xsltDebug'/> - <exports symbol='xsltFunctionNodeSet'/> - <exports symbol='xsltRegisterAllExtras'/> - <exports symbol='xsltRegisterExtras'/> + <file name='templates'> + <exports symbol='xsltAttrListTemplateProcess'/> + <exports symbol='xsltAttrTemplateProcess'/> + <exports symbol='xsltAttrTemplateValueProcess'/> + <exports symbol='xsltAttrTemplateValueProcessNode'/> + <exports symbol='xsltEvalAttrValueTemplate'/> + <exports symbol='xsltEvalStaticAttrValueTemplate'/> + <exports symbol='xsltEvalTemplateString'/> + <exports symbol='xsltEvalXPathPredicate'/> + <exports symbol='xsltEvalXPathString'/> + <exports symbol='xsltEvalXPathStringNs'/> + <exports symbol='xsltTemplateProcess'/> + </file> + <file name='documents'> + <exports symbol='xsltFindDocument'/> + <exports symbol='xsltFreeDocuments'/> + <exports symbol='xsltFreeStyleDocuments'/> + <exports symbol='xsltLoadDocument'/> + <exports symbol='xsltLoadStyleDocument'/> + <exports symbol='xsltNewDocument'/> + <exports symbol='xsltNewStyleDocument'/> </file> <file name='xsltInternals'> <exports symbol='CHECK_STOPPED'/> @@ -337,11 +335,13 @@ <exports symbol='xsltLibxsltVersion'/> <exports symbol='xsltMaxDepth'/> </file> - <file name='preproc'> - <exports symbol='xsltDocumentComp'/> - <exports symbol='xsltExtMarker'/> - <exports symbol='xsltFreeStylePreComps'/> - <exports symbol='xsltStylePreCompute'/> + <file name='namespaces'> + <exports symbol='xsltCopyNamespace'/> + <exports symbol='xsltCopyNamespaceList'/> + <exports symbol='xsltFreeNamespaceAliasHashes'/> + <exports symbol='xsltGetNamespace'/> + <exports symbol='xsltGetSpecialNamespace'/> + <exports symbol='xsltNamespaceAlias'/> </file> <file name='variables'> <exports symbol='XSLT_REGISTER_VARIABLE_LOOKUP'/> diff --git a/libxslt.spec.in b/libxslt.spec.in index 62d707d0..6d5444d1 100644 --- a/libxslt.spec.in +++ b/libxslt.spec.in @@ -61,25 +61,6 @@ rm -fr %{buildroot} %makeinstall -# -# this is a bit ugly but tries to generate the bindings for all versions -# of python installed -# -for i in %{prefix}/include/python* -do - py_version=`echo $i | sed "s+%{prefix}/include/python++"` - if test -x %{prefix}/bin/python$py_version - then - echo generating bindings for Python $py_version - (cd python ; make clean ; \ - make PYTHON="%{prefix}/bin/python$py_version" \ - PYTHON_VERSION="$py_version"; \ -%makeinstall PYTHON="%{prefix}/bin/python$py_version" \ - PYTHON_VERSION="$py_version" \ - prefix=$RPM_BUILD_ROOT%{prefix}) - fi -done - %clean rm -fr %{buildroot} diff --git a/python/Makefile.am b/python/Makefile.am index 4e785ef6..597984d1 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -33,7 +33,6 @@ mylibs = \ all-local: libxslt.py -pythondir = $(libdir)/python${PYTHON_VERSION}/site-packages python_LTLIBRARIES = libxsltmod.la libxsltmod_la_SOURCES = libxslt.c types.c libxslt-py.c @@ -43,8 +42,8 @@ libxslt.py: $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py cat $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py > libxslt.py install-data-local: - $(mkinstalldirs) $(DESTDIR)$(libdir)/python${PYTHON_VERSION}/site-packages - @INSTALL@ -m 0644 libxslt.py $(DESTDIR)$(libdir)/python${PYTHON_VERSION}/site-packages + $(mkinstalldirs) $(DESTDIR)$(pythondir) + @INSTALL@ -m 0644 libxslt.py $(DESTDIR)$(pythondir) $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR) @(for doc in $(DOCS) ; \ do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done) diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c index e15fbb4a..9f2ebe97 100644 --- a/xsltproc/xsltproc.c +++ b/xsltproc/xsltproc.c @@ -73,6 +73,10 @@ #endif #endif /* WIN32 */ +#ifdef HAVE_SYS_TIMEB_H +#include <sys/timeb.h> +#endif + #ifndef HAVE_STAT # ifdef HAVE__STAT /* MS C library seems to define stat and _stat. The definition |