applied patch from Roumen Petrov for mingw cross compilation problems

* python/Makefile.am libxslt/Makefile.am configure.in
  libexslt/Makefile.am: applied patch from Roumen Petrov for
  mingw cross compilation problems raised by Rich Jones
daniel

svn path=/trunk/; revision=1493

diff --git a/ChangeLog b/ChangeLog
index 568c9a0..0bd1ce9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 14 15:06:55 CET 2008 Daniel Veillard <veillard@redhat.com>
+
+       * python/Makefile.am libxslt/Makefile.am configure.in
+         libexslt/Makefile.am: applied patch from Roumen Petrov for
+         mingw cross compilation problems raised by Rich Jones
+
 Tue Oct 28 11:55:27 CET 2008 Daniel Veillard <veillard@redhat.com>
 
        * configure.in Makefile.am: patch from Richard Jones to build

diff --git a/configure.in b/configure.in
index 7775e37..2097ab1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,6 @@ AC_PREREQ(2.2)
 AC_INIT(libxslt/xslt.c)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
-AC_LIBTOOL_WIN32_DLL
 AC_GNU_SOURCE
 
 dnl
@@ -105,6 +104,8 @@ AC_PATH_PROG(MV, mv, /bin/mv)
 AC_PATH_PROG(TAR, tar, /bin/tar)
 
 AC_STDC_HEADERS
+
+AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
 
@@ -588,6 +589,9 @@ fi
 WIN32_EXTRA_LIBADD=
 WIN32_EXTRA_LDFLAGS=
 case "$host" in
+ *-*-cygwin*)
+ WIN32_EXTRA_LDFLAGS="-no-undefined"
+ ;;
  *-*-mingw*)
  WIN32_EXTRA_LIBADD="-lwsock32"
  WIN32_EXTRA_LDFLAGS="-no-undefined"

diff --git a/libexslt/Makefile.am b/libexslt/Makefile.am
index 8f033bd..0326ca1 100644 (file)
--- a/libexslt/Makefile.am
+++ b/libexslt/Makefile.am
@@ -29,7 +29,7 @@ libexslt_la_SOURCES =                   \
        dynamic.c
 
 libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
-libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ $(LIBGCRYPT_LIBS)
+libexslt_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info @LIBEXSLT_VERSION_INFO@ $(LIBGCRYPT_LIBS)
 
 man_MANS = libexslt.3
 

diff --git a/libxslt/Makefile.am b/libxslt/Makefile.am
index 2e271ca..dfb9fb9 100644 (file)
--- a/libxslt/Makefile.am
+++ b/libxslt/Makefile.am
@@ -53,7 +53,7 @@ libxslt_la_SOURCES =                  \
        libxslt.h
 
 libxslt_la_LIBADD = $(EXTRA_LIBS)
-libxslt_la_LDFLAGS = -version-info @LIBXSLT_VERSION_INFO@ -no-undefined
+libxslt_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info @LIBXSLT_VERSION_INFO@
 
 man_MANS = libxslt.3
 

diff --git a/python/Makefile.am b/python/Makefile.am
index de2f8e3..9591c11 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -24,7 +24,7 @@ EXTRA_DIST =                  \
        libxslt-python-api.xml  \
        $(DOCS)
 
-libxsltmod_la_LDFLAGS = -module -avoid-version
+libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
 
 if WITH_PYTHON
 mylibs = \