1
0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-09 03:41:46 +03:00

fixing portability bug #113002 on HP-UX cleanup of --with-python like for

* 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
Daniel
This commit is contained in:
Daniel Veillard
2003-05-15 20:28:53 +00:00
parent c589bdcf67
commit ada71b3bb5
6 changed files with 84 additions and 86 deletions

View File

@ -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> Thu May 15 11:45:00 HKT 2003 William Brack <wbrack@mmm.com.hk>
* libxslt/xsltutils.c: fixing bug #112995, a problem with * libxslt/xsltutils.c: fixing bug #112995, a problem with

View File

@ -151,6 +151,7 @@ PYTHON=
PYTHON_VERSION= PYTHON_VERSION=
PYTHON_INCLUDES= PYTHON_INCLUDES=
PYTHON_SITE_PACKAGES= PYTHON_SITE_PACKAGES=
pythondir=
AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found]) AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found])
if test "$with_python" != "no" ; then if test "$with_python" != "no" ; then
if test -x "$with_python/bin/python" if test -x "$with_python/bin/python"
@ -206,6 +207,12 @@ except: print 0"`
fi fi
fi fi
fi fi
if test "$with_python" != ""
then
pythondir='$(PYTHON_SITE_PACKAGES)'
else
pythondir='$(libdir)/python${PYTHON_VERSION}/site-packages'
fi
fi fi
AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
if test "$PYTHON_INCLUDES" != "" if test "$PYTHON_INCLUDES" != ""
@ -214,6 +221,7 @@ then
else else
PYTHON_SUBDIR= PYTHON_SUBDIR=
fi fi
AC_SUBST(pythondir)
AC_SUBST(PYTHON_SUBDIR) AC_SUBST(PYTHON_SUBDIR)
dnl dnl

View File

@ -1,14 +1,16 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<api name='libxslt'> <api name='libxslt'>
<files> <files>
<file name='documents'> <file name='extra'>
<exports symbol='xsltFindDocument'/> <exports symbol='XSLT_LIBXSLT_NAMESPACE'/>
<exports symbol='xsltFreeDocuments'/> <exports symbol='XSLT_NORM_SAXON_NAMESPACE'/>
<exports symbol='xsltFreeStyleDocuments'/> <exports symbol='XSLT_SAXON_NAMESPACE'/>
<exports symbol='xsltLoadDocument'/> <exports symbol='XSLT_XALAN_NAMESPACE'/>
<exports symbol='xsltLoadStyleDocument'/> <exports symbol='XSLT_XT_NAMESPACE'/>
<exports symbol='xsltNewDocument'/> <exports symbol='xsltDebug'/>
<exports symbol='xsltNewStyleDocument'/> <exports symbol='xsltFunctionNodeSet'/>
<exports symbol='xsltRegisterAllExtras'/>
<exports symbol='xsltRegisterExtras'/>
</file> </file>
<file name='imports'> <file name='imports'>
<exports symbol='XSLT_GET_IMPORT_INT'/> <exports symbol='XSLT_GET_IMPORT_INT'/>
@ -20,40 +22,11 @@
<exports symbol='xsltParseStylesheetImport'/> <exports symbol='xsltParseStylesheetImport'/>
<exports symbol='xsltParseStylesheetInclude'/> <exports symbol='xsltParseStylesheetInclude'/>
</file> </file>
<file name='security'> <file name='preproc'>
<exports symbol='XSLT_SECPREF_CREATE_DIRECTORY'/> <exports symbol='xsltDocumentComp'/>
<exports symbol='XSLT_SECPREF_READ_FILE'/> <exports symbol='xsltExtMarker'/>
<exports symbol='XSLT_SECPREF_READ_NETWORK'/> <exports symbol='xsltFreeStylePreComps'/>
<exports symbol='XSLT_SECPREF_WRITE_FILE'/> <exports symbol='xsltStylePreCompute'/>
<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> </file>
<file name='xsltutils'> <file name='xsltutils'>
<exports symbol='IS_XSLT_ELEM'/> <exports symbol='IS_XSLT_ELEM'/>
@ -122,24 +95,49 @@
<exports symbol='xsltUnparsedEntityURIFunction'/> <exports symbol='xsltUnparsedEntityURIFunction'/>
<exports symbol='xsltXPathFunctionLookup'/> <exports symbol='xsltXPathFunctionLookup'/>
</file> </file>
<file name='namespaces'> <file name='security'>
<exports symbol='xsltCopyNamespace'/> <exports symbol='XSLT_SECPREF_CREATE_DIRECTORY'/>
<exports symbol='xsltCopyNamespaceList'/> <exports symbol='XSLT_SECPREF_READ_FILE'/>
<exports symbol='xsltFreeNamespaceAliasHashes'/> <exports symbol='XSLT_SECPREF_READ_NETWORK'/>
<exports symbol='xsltGetNamespace'/> <exports symbol='XSLT_SECPREF_WRITE_FILE'/>
<exports symbol='xsltGetSpecialNamespace'/> <exports symbol='XSLT_SECPREF_WRITE_NETWORK'/>
<exports symbol='xsltNamespaceAlias'/> <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>
<file name='extra'> <file name='templates'>
<exports symbol='XSLT_LIBXSLT_NAMESPACE'/> <exports symbol='xsltAttrListTemplateProcess'/>
<exports symbol='XSLT_NORM_SAXON_NAMESPACE'/> <exports symbol='xsltAttrTemplateProcess'/>
<exports symbol='XSLT_SAXON_NAMESPACE'/> <exports symbol='xsltAttrTemplateValueProcess'/>
<exports symbol='XSLT_XALAN_NAMESPACE'/> <exports symbol='xsltAttrTemplateValueProcessNode'/>
<exports symbol='XSLT_XT_NAMESPACE'/> <exports symbol='xsltEvalAttrValueTemplate'/>
<exports symbol='xsltDebug'/> <exports symbol='xsltEvalStaticAttrValueTemplate'/>
<exports symbol='xsltFunctionNodeSet'/> <exports symbol='xsltEvalTemplateString'/>
<exports symbol='xsltRegisterAllExtras'/> <exports symbol='xsltEvalXPathPredicate'/>
<exports symbol='xsltRegisterExtras'/> <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>
<file name='xsltInternals'> <file name='xsltInternals'>
<exports symbol='CHECK_STOPPED'/> <exports symbol='CHECK_STOPPED'/>
@ -337,11 +335,13 @@
<exports symbol='xsltLibxsltVersion'/> <exports symbol='xsltLibxsltVersion'/>
<exports symbol='xsltMaxDepth'/> <exports symbol='xsltMaxDepth'/>
</file> </file>
<file name='preproc'> <file name='namespaces'>
<exports symbol='xsltDocumentComp'/> <exports symbol='xsltCopyNamespace'/>
<exports symbol='xsltExtMarker'/> <exports symbol='xsltCopyNamespaceList'/>
<exports symbol='xsltFreeStylePreComps'/> <exports symbol='xsltFreeNamespaceAliasHashes'/>
<exports symbol='xsltStylePreCompute'/> <exports symbol='xsltGetNamespace'/>
<exports symbol='xsltGetSpecialNamespace'/>
<exports symbol='xsltNamespaceAlias'/>
</file> </file>
<file name='variables'> <file name='variables'>
<exports symbol='XSLT_REGISTER_VARIABLE_LOOKUP'/> <exports symbol='XSLT_REGISTER_VARIABLE_LOOKUP'/>

View File

@ -61,25 +61,6 @@ rm -fr %{buildroot}
%makeinstall %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 %clean
rm -fr %{buildroot} rm -fr %{buildroot}

View File

@ -33,7 +33,6 @@ mylibs = \
all-local: libxslt.py all-local: libxslt.py
pythondir = $(libdir)/python${PYTHON_VERSION}/site-packages
python_LTLIBRARIES = libxsltmod.la python_LTLIBRARIES = libxsltmod.la
libxsltmod_la_SOURCES = libxslt.c types.c libxslt-py.c 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 cat $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py > libxslt.py
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)$(libdir)/python${PYTHON_VERSION}/site-packages $(mkinstalldirs) $(DESTDIR)$(pythondir)
@INSTALL@ -m 0644 libxslt.py $(DESTDIR)$(libdir)/python${PYTHON_VERSION}/site-packages @INSTALL@ -m 0644 libxslt.py $(DESTDIR)$(pythondir)
$(mkinstalldirs) $(DESTDIR)$(DOCS_DIR) $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
@(for doc in $(DOCS) ; \ @(for doc in $(DOCS) ; \
do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done) do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)

View File

@ -73,6 +73,10 @@
#endif #endif
#endif /* WIN32 */ #endif /* WIN32 */
#ifdef HAVE_SYS_TIMEB_H
#include <sys/timeb.h>
#endif
#ifndef HAVE_STAT #ifndef HAVE_STAT
# ifdef HAVE__STAT # ifdef HAVE__STAT
/* MS C library seems to define stat and _stat. The definition /* MS C library seems to define stat and _stat. The definition