# HG changeset patch
# User Nick Wellnhofer <wellnhofer@aevum.de>
# Date 1548858122 -3600
#      Wed Jan 30 15:22:02 2019 +0100
# Node ID 0c3aa271dfff2bc8882450c1b78178bb6ffbb162
# Parent  1afdaa820eb428f16d20bcf416dc82fab37deb30
Remove WIN32_EXTRA_* variables

Simply use LDFLAGS and LIBS instead.

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -579,15 +579,11 @@
 LIBXSLT_DEFAULT_PLUGINS_PATH="$expanded_libdir/libxslt-plugins"
 AC_SUBST(LIBXSLT_DEFAULT_PLUGINS_PATH)
 
-WIN32_EXTRA_LIBADD=
-WIN32_EXTRA_LDFLAGS=
 case "$host" in
  *-*-cygwin*|*-*-mingw*)
- WIN32_EXTRA_LDFLAGS="-no-undefined"
+ LDFLAGS="$LDFLAGS -no-undefined"
  ;;
 esac
-AC_SUBST(WIN32_EXTRA_LIBADD)
-AC_SUBST(WIN32_EXTRA_LDFLAGS)
 
 
 AC_SUBST(XSLTPROCDV)
diff --git a/libexslt/Makefile.am b/libexslt/Makefile.am
--- a/libexslt/Makefile.am
+++ b/libexslt/Makefile.am
@@ -28,7 +28,7 @@
 	dynamic.c
 
 libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) $(M_LIBS)
-libexslt_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBEXSLT_VERSION_INFO)
+libexslt_la_LDFLAGS = -version-info $(LIBEXSLT_VERSION_INFO)
 
 man_MANS = libexslt.3
 
diff --git a/libxslt/Makefile.am b/libxslt/Makefile.am
--- a/libxslt/Makefile.am
+++ b/libxslt/Makefile.am
@@ -64,7 +64,6 @@
 
 libxslt_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS)
 libxslt_la_LDFLAGS =					\
-		$(WIN32_EXTRA_LDFLAGS)			\
 		$(LIBXSLT_VERSION_SCRIPT)		\
 		-version-info $(LIBXSLT_VERSION_INFO)
 
diff --git a/python/Makefile.am b/python/Makefile.am
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -19,7 +19,7 @@
 	libxslt-python-api.xml	\
 	$(DOCS)
 
-libxsltmod_la_LDFLAGS =  $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
+libxsltmod_la_LDFLAGS =  -module -avoid-version
 
 if WITH_PYTHON
 mylibs = \
diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
--- a/tests/plugins/Makefile.am
+++ b/tests/plugins/Makefile.am
@@ -21,7 +21,7 @@
 xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
 xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
 xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
-xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir)
+xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version -rpath $(plugindir)
 
 test-logall:
 	@echo '## Running plugin tests'
diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am
--- a/xsltproc/Makefile.am
+++ b/xsltproc/Makefile.am
@@ -23,7 +23,7 @@
 
 LDADDS = $(top_builddir)/libxslt/libxslt.la \
          $(top_builddir)/libexslt/libexslt.la \
-	$(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
+	$(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS)
 
 xsltproc_LDADD = $(LIBGCRYPT_LIBS) $(LDADDS)