[xslt] [Patch] fixes for MinGW

[Christian Ehrlicher <Ch Ehrlicher gmx de>]

Hi,

here a small patch to fix mingw compile

libexslt/exsltexports.h + libxslt/xsltexports.h:
don't know why it was changed (in 2004) but it was wrong

win32/Makefile.mingw:
added attrvt
changed library link order to resolve linker errors


This fixes also problems whe trying to link against libxslt because now 
XSLTPUBVAR is correctly defined to "__declspec(dllimport) extern" again.

This should also fix bug #324857


Christian

Index: libexslt/exsltexports.h
===================================================================
--- libexslt/exsltexports.h	(revision 1483)
+++ libexslt/exsltexports.h	(working copy)
@@ -91,10 +91,7 @@
   #undef EXSLTPUBFUN
   #undef EXSLTPUBVAR
   #undef EXSLTCALL
-/*
   #if defined(IN_LIBEXSLT) && !defined(LIBEXSLT_STATIC)
-*/
-  #if !defined(LIBEXSLT_STATIC)
     #define EXSLTPUBFUN __declspec(dllexport)
     #define EXSLTPUBVAR __declspec(dllexport) extern
   #else
Index: libxslt/xsltexports.h
===================================================================
--- libxslt/xsltexports.h	(revision 1483)
+++ libxslt/xsltexports.h	(working copy)
@@ -93,10 +93,7 @@
   #undef XSLTPUBFUN
   #undef XSLTPUBVAR
   #undef XSLTCALL
-/*
   #if defined(IN_LIBXSLT) && !defined(LIBXSLT_STATIC)
-*/
-  #if !defined(LIBXSLT_STATIC)
     #define XSLTPUBFUN __declspec(dllexport)
     #define XSLTPUBVAR __declspec(dllexport) extern
   #else
Index: win32/Makefile.mingw
===================================================================
--- win32/Makefile.mingw	(revision 1483)
+++ win32/Makefile.mingw	(working copy)
@@ -88,7 +88,8 @@
 	$(XSLT_INTDIR)/variables.o\
 	$(XSLT_INTDIR)/xslt.o\
 	$(XSLT_INTDIR)/xsltlocale.o\
-	$(XSLT_INTDIR)/xsltutils.o
+	$(XSLT_INTDIR)/xsltutils.o\
+	$(XSLT_INTDIR)/attrvt.o
 XSLT_SRCS = $(subst .o,.c,$(subst $(XSLT_INTDIR),$(XSLT_SRCDIR),$(XSLT_OBJS)))
 
 # Static libxslt object files.
@@ -109,7 +110,8 @@
 	$(XSLT_INTDIR_A)/variables.o\
 	$(XSLT_INTDIR_A)/xslt.o\
 	$(XSLT_INTDIR_A)/xsltlocale.o\
-	$(XSLT_INTDIR_A)/xsltutils.o
+	$(XSLT_INTDIR_A)/xsltutils.o\
+	$(XSLT_INTDIR)/attrvt.o
 
 # Libexslt object files.
 EXSLT_OBJS = $(EXSLT_INTDIR)/common.o\
@@ -290,11 +292,11 @@
 APP_LDFLAGS += -Bstatic
 $(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c
 	$(CC) $(CFLAGS) -o $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -c $< 
-	$(LD) $(APP_LDFLAGS) -o $@ $(APPLIBS) $(subst .c,.o,$(UTILS_INTDIR)/$(<F))
+	$(LD) $(APP_LDFLAGS) $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -o $@ $(APPLIBS)
 else
 $(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c 
 	$(CC) $(CFLAGS) -o $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -c $< 
-	$(LD) $(APP_LDFLAGS) -o $@ $(APPLIBS) $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) 
+	$(LD) $(APP_LDFLAGS) $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -o $@ $(APPLIBS)
 endif
 
 # Builds xsltproc and friends. Uses the implicit rule for commands.

Attachment: signature.asc
Description: OpenPGP digital signature