1
0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-08-07 10:42:55 +03:00

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
This commit is contained in:
Daniel Veillard
2008-11-14 14:08:37 +00:00
parent dd29c988bd
commit eac88d34bf
5 changed files with 14 additions and 4 deletions

View File

@@ -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> Tue Oct 28 11:55:27 CET 2008 Daniel Veillard <veillard@redhat.com>
* configure.in Makefile.am: patch from Richard Jones to build * configure.in Makefile.am: patch from Richard Jones to build

View File

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

View File

@@ -29,7 +29,7 @@ libexslt_la_SOURCES = \
dynamic.c dynamic.c
libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) 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 man_MANS = libexslt.3

View File

@@ -53,7 +53,7 @@ libxslt_la_SOURCES = \
libxslt.h libxslt.h
libxslt_la_LIBADD = $(EXTRA_LIBS) 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 man_MANS = libxslt.3

View File

@@ -24,7 +24,7 @@ EXTRA_DIST = \
libxslt-python-api.xml \ libxslt-python-api.xml \
$(DOCS) $(DOCS)
libxsltmod_la_LDFLAGS = -module -avoid-version libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
if WITH_PYTHON if WITH_PYTHON
mylibs = \ mylibs = \