libxslt r1493 - in trunk: . libexslt libxslt python

[veillard svn gnome org]

Author: veillard
Date: Fri Nov 14 14:08:37 2008
New Revision: 1493
URL: http://svn.gnome.org/viewvc/libxslt?rev=1493&view=rev

Log:
* 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


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libexslt/Makefile.am
   trunk/libxslt/Makefile.am
   trunk/python/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Nov 14 14:08:37 2008
@@ -3,7 +3,6 @@
 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(TAR, tar, /bin/tar)
 
 AC_STDC_HEADERS
+
+AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
 
@@ -588,6 +589,9 @@
 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"

Modified: trunk/libexslt/Makefile.am
==============================================================================
--- trunk/libexslt/Makefile.am	(original)
+++ trunk/libexslt/Makefile.am	Fri Nov 14 14:08:37 2008
@@ -29,7 +29,7 @@
 	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
 

Modified: trunk/libxslt/Makefile.am
==============================================================================
--- trunk/libxslt/Makefile.am	(original)
+++ trunk/libxslt/Makefile.am	Fri Nov 14 14:08:37 2008
@@ -53,7 +53,7 @@
 	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
 

Modified: trunk/python/Makefile.am
==============================================================================
--- trunk/python/Makefile.am	(original)
+++ trunk/python/Makefile.am	Fri Nov 14 14:08:37 2008
@@ -24,7 +24,7 @@
 	libxslt-python-api.xml	\
 	$(DOCS)
 
-libxsltmod_la_LDFLAGS = -module -avoid-version
+libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
 
 if WITH_PYTHON
 mylibs = \