diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | libexslt/common.c | 2 | ||||
| -rw-r--r-- | libexslt/date.c | 2 | ||||
| -rw-r--r-- | libexslt/dynamic.c | 2 | ||||
| -rw-r--r-- | libexslt/exslt.c | 2 | ||||
| -rw-r--r-- | libexslt/functions.c | 2 | ||||
| -rw-r--r-- | libexslt/libexslt.h | 4 | ||||
| -rw-r--r-- | libexslt/math.c | 2 | ||||
| -rw-r--r-- | libexslt/saxon.c | 2 | ||||
| -rw-r--r-- | libexslt/sets.c | 2 | ||||
| -rw-r--r-- | libexslt/strings.c | 2 | ||||
| -rw-r--r-- | libxslt/libxslt.h | 4 | ||||
| -rw-r--r-- | libxslt/numbersInternals.h | 4 | ||||
| -rw-r--r-- | xsltproc/Makefile.am | 3 |
15 files changed, 41 insertions, 15 deletions
@@ -1,4 +1,10 @@ -Mod Aug 18 14:42:12 HKT 2003 William Brack <wbrack@mmm.com.hk> +Tue Aug 19 00:38:46 CEST 2003 Daniel Veillard <daniel@veillard.com> + + * xsltproc/Makefile.am libxslt/libxslt.h libxslt/numbersInternals.h + libexslt/*.c configure.in: applied patch from Mikhail Grushinskiy + for compilation with MingW compiler on Windows. + +Mon Aug 18 14:42:12 HKT 2003 William Brack <wbrack@mmm.com.hk> * keys.c: enhanced xsltInitCtxtKey to take care of multiple instances of a key with the same namespace:name, reported diff --git a/configure.in b/configure.in index 2f383a37..aea19a9f 100644 --- a/configure.in +++ b/configure.in @@ -413,6 +413,21 @@ if test "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XSLT" ; then # PYTHONSODV="libxsltmod.so.dv" fi +WIN32_EXTRA_LIBADD= +WIN32_EXTRA_LDFLAGS= +case "$host" in + *-*-mingw*) + WIN32_EXTRA_LIBADD="-lwsock32" + WIN32_EXTRA_LDFLAGS="-no-undefined" + AC_DEFINE([_WINSOCKAPI_],1,[Using the Win32 Socket implementation]) + AC_DEFINE([snprintf],[_snprintf],[Win32 Std C name mangling work-around]) + AC_DEFINE([vsnprintf],[_vsnprintf],[Win32 Std C name mangling work-around]) + ;; +esac +AC_SUBST(WIN32_EXTRA_LIBADD) +AC_SUBST(WIN32_EXTRA_LDFLAGS) + + AC_SUBST(XSLTPROCDV) AC_SUBST(PYTHONSODV) AC_SUBST(XML_CONFIG) diff --git a/libexslt/common.c b/libexslt/common.c index 1fd59857..86538f02 100644 --- a/libexslt/common.c +++ b/libexslt/common.c @@ -1,7 +1,7 @@ #define IN_LIBEXSLT #include "libexslt/libexslt.h" -#if defined(WIN32) && !defined (__CYGWIN__) +#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__) #include <win32config.h> #else #include "config.h" diff --git a/libexslt/date.c b/libexslt/date.c index 7e2658bf..88980eb7 100644 --- a/libexslt/date.c +++ b/libexslt/date.c @@ -22,7 +22,7 @@ #define IN_LIBEXSLT #include "libexslt/libexslt.h" -#if defined(WIN32) && !defined (__CYGWIN__) +#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__) #include <win32config.h> #else #include "config.h" diff --git a/libexslt/dynamic.c b/libexslt/dynamic.c index 705a1bcb..1cef9460 100644 --- a/libexslt/dynamic.c +++ b/libexslt/dynamic.c @@ -23,7 +23,7 @@ #define IN_LIBEXSLT #include "libexslt/libexslt.h" -#if defined(WIN32) && !defined (__CYGWIN__) +#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__) #include <win32config.h> #else #include "config.h" diff --git a/libexslt/exslt.c b/libexslt/exslt.c index d46cefca..6f419135 100644 --- a/libexslt/exslt.c +++ b/libexslt/exslt.c @@ -3,7 +3,7 @@ #include <libxml/xmlversion.h> -#if defined(WIN32) && !defined (__CYGWIN__) +#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__) #include <win32config.h> #else #include "config.h" diff --git a/libexslt/functions.c b/libexslt/functions.c index c5ef0b0c..efff43f3 100644 --- a/libexslt/functions.c +++ b/libexslt/functions.c @@ -1,7 +1,7 @@ #define IN_LIBEXSLT #include "libexslt/libexslt.h" -#if defined(WIN32) && !defined (__CYGWIN__) +#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__) #include <win32config.h> #else #include "config.h" diff --git a/libexslt/libexslt.h b/libexslt/libexslt.h index 9a65d9e9..0fa00829 100644 --- a/libexslt/libexslt.h +++ b/libexslt/libexslt.h @@ -9,13 +9,13 @@ #ifndef __XSLT_LIBEXSLT_H__ #define __XSLT_LIBEXSLT_H__ -#if defined(WIN32) && !defined (__CYGWIN__) +#if defined(WIN32) && !defined (__CYGWIN__) && !defined (__MINGW32__) #include <win32config.h> #else #include "config.h" #endif -#if defined(WIN32) && !defined(__CYGWIN__) +#if defined(WIN32) && !defined(__CYGWIN__) && !defined (__MINGW32__) #include "xsltwin32config.h" #else #include "xsltconfig.h" diff --git a/libexslt/math.c b/libexslt/math.c index 30a2b431..2c0c8848 100644 --- a/libexslt/math.c +++ b/libexslt/math.c @@ -1,7 +1,7 @@ #define IN_LIBEXSLT #include "libexslt/libexslt.h" -#if defined(WIN32) && !defined (__CYGWIN__) +#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__) #include <win32config.h> #else #include "config.h" diff --git a/libexslt/saxon.c b/libexslt/saxon.c index 30ec5144..02e6a57e 100644 --- a/libexslt/saxon.c +++ b/libexslt/saxon.c @@ -1,7 +1,7 @@ #define IN_LIBEXSLT #include "libexslt/libexslt.h" -#if defined(WIN32) && !defined (__CYGWIN__) +#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__) #include <win32config.h> #else #include "config.h" diff --git a/libexslt/sets.c b/libexslt/sets.c index 59dc4387..6739b5d1 100644 --- a/libexslt/sets.c +++ b/libexslt/sets.c @@ -1,7 +1,7 @@ #define IN_LIBEXSLT #include "libexslt/libexslt.h" -#if defined(WIN32) && !defined (__CYGWIN__) +#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__) #include <win32config.h> #else #include "config.h" diff --git a/libexslt/strings.c b/libexslt/strings.c index 6ddbc5ed..c0928191 100644 --- a/libexslt/strings.c +++ b/libexslt/strings.c @@ -1,7 +1,7 @@ #define IN_LIBEXSLT #include "libexslt/libexslt.h" -#if defined(WIN32) && !defined (__CYGWIN__) +#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__) #include <win32config.h> #else #include "config.h" diff --git a/libxslt/libxslt.h b/libxslt/libxslt.h index f3f57435..61a26cfe 100644 --- a/libxslt/libxslt.h +++ b/libxslt/libxslt.h @@ -9,13 +9,13 @@ #ifndef __XSLT_LIBXSLT_H__ #define __XSLT_LIBXSLT_H__ -#if defined(WIN32) && !defined (__CYGWIN__) +#if defined(WIN32) && !defined (__CYGWIN__) && !defined (__MINGW32__) #include <win32config.h> #else #include "config.h" #endif -#if defined(WIN32) && !defined(__CYGWIN__) +#if defined(WIN32) && !defined(__CYGWIN__) && !defined (__MINGW32__) #include "xsltwin32config.h" #else #include "xsltconfig.h" diff --git a/libxslt/numbersInternals.h b/libxslt/numbersInternals.h index 57479ece..9920ef39 100644 --- a/libxslt/numbersInternals.h +++ b/libxslt/numbersInternals.h @@ -36,6 +36,10 @@ struct _xsltNumberData { int groupingCharacterLen; xmlDocPtr doc; xmlNodePtr node; + + /* + * accelerators + */ }; /** diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am index ac0592c5..a8828de5 100644 --- a/xsltproc/Makefile.am +++ b/xsltproc/Makefile.am @@ -16,7 +16,8 @@ DEPS = $(top_builddir)/libxslt/libxslt.la \ LDADDS = @STATIC_BINARIES@ \ $(top_builddir)/libxslt/libxslt.la \ $(top_builddir)/libexslt/libexslt.la \ - @LIBXML_LIBS@ $(EXTRA_LIBS) + @LIBXML_LIBS@ $(EXTRA_LIBS) @WIN32_EXTRA_LIBADD@ xsltproc.dv: xsltproc.o $(CC) $(CFLAGS) -o xsltproc xsltproc.o ../libexslt/.libs/libexslt.a ../libxslt/.libs/libxslt.a @LIBXML_LIBS@ $(EXTRA_LIBS) + |