|
Line 0
Link Here
|
|
|
1 |
https://bugzilla.gnome.org/show_bug.cgi?id=766669 |
| 2 |
|
| 3 |
diff --git a/configure.in b/configure.in |
| 4 |
index d055979..1106e37 100644 |
| 5 |
--- a/configure.in |
| 6 |
+++ b/configure.in |
| 7 |
@@ -632,21 +632,15 @@ LIBXSLT_DEFAULT_PLUGINS_PATH="$expanded_libdir/libxslt-plugins" |
| 8 |
AC_SUBST(LIBXSLT_DEFAULT_PLUGINS_PATH) |
| 9 |
|
| 10 |
WIN32_EXTRA_LIBADD= |
| 11 |
-WIN32_EXTRA_LDFLAGS= |
| 12 |
case "$host" in |
| 13 |
- *-*-cygwin*) |
| 14 |
- WIN32_EXTRA_LDFLAGS="-no-undefined" |
| 15 |
- ;; |
| 16 |
*-*-mingw*) |
| 17 |
WIN32_EXTRA_LIBADD="-lwsock32" |
| 18 |
- WIN32_EXTRA_LDFLAGS="-no-undefined" |
| 19 |
AC_DEFINE([_WINSOCKAPI_],1,[Using the Win32 Socket implementation]) |
| 20 |
AC_DEFINE([snprintf],[_snprintf],[Win32 Std C name mangling work-around]) |
| 21 |
AC_DEFINE([vsnprintf],[_vsnprintf],[Win32 Std C name mangling work-around]) |
| 22 |
;; |
| 23 |
esac |
| 24 |
AC_SUBST(WIN32_EXTRA_LIBADD) |
| 25 |
-AC_SUBST(WIN32_EXTRA_LDFLAGS) |
| 26 |
|
| 27 |
|
| 28 |
AC_SUBST(XSLTPROCDV) |
| 29 |
diff --git a/libexslt/Makefile.am b/libexslt/Makefile.am |
| 30 |
index 1cf5138..ec69124 100644 |
| 31 |
--- a/libexslt/Makefile.am |
| 32 |
+++ b/libexslt/Makefile.am |
| 33 |
@@ -28,7 +28,7 @@ libexslt_la_SOURCES = \ |
| 34 |
dynamic.c |
| 35 |
|
| 36 |
libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) |
| 37 |
-libexslt_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBEXSLT_VERSION_INFO) |
| 38 |
+libexslt_la_LDFLAGS = -no-undefined -version-info $(LIBEXSLT_VERSION_INFO) |
| 39 |
|
| 40 |
man_MANS = libexslt.3 |
| 41 |
|
| 42 |
diff --git a/libxslt/Makefile.am b/libxslt/Makefile.am |
| 43 |
index d9fed68..cd65fa3 100644 |
| 44 |
--- a/libxslt/Makefile.am |
| 45 |
+++ b/libxslt/Makefile.am |
| 46 |
@@ -64,7 +64,7 @@ endif |
| 47 |
|
| 48 |
libxslt_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) |
| 49 |
libxslt_la_LDFLAGS = \ |
| 50 |
- $(WIN32_EXTRA_LDFLAGS) \ |
| 51 |
+ -no-undefined \ |
| 52 |
$(LIBXSLT_VERSION_SCRIPT) \ |
| 53 |
-version-info $(LIBXSLT_VERSION_INFO) |
| 54 |
|
| 55 |
diff --git a/python/Makefile.am b/python/Makefile.am |
| 56 |
index fa58b78..314ca36 100644 |
| 57 |
--- a/python/Makefile.am |
| 58 |
+++ b/python/Makefile.am |
| 59 |
@@ -19,7 +19,7 @@ |
| 60 |
libxsltmod_la_SOURCES = libxslt.c types.c |
| 61 |
nodist_libxsltmod_la_SOURCES = libxslt-py.c |
| 62 |
libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS) |
| 63 |
-libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version -shared |
| 64 |
+libxsltmod_la_LDFLAGS = -no-undefined $(PYTHON_LDFLAGS) -module -avoid-version -shared |
| 65 |
|
| 66 |
libxslt.py: $(srcdir)/libxsl.py libxsltclass.py |
| 67 |
cat $(srcdir)/libxsl.py libxsltclass.py > $@ |
| 68 |
diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am |
| 69 |
index e0736ab..48d5424 100644 |
| 70 |
--- a/tests/plugins/Makefile.am |
| 71 |
+++ b/tests/plugins/Makefile.am |
| 72 |
@@ -21,7 +21,7 @@ plugindir = $(abs_builddir)/.libs |
| 73 |
xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) |
| 74 |
xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c |
| 75 |
xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) |
| 76 |
-xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version -rpath $(plugindir) |
| 77 |
+xmlsoft_org_xslt_testplugin_la_LDFLAGS = -no-undefined -module -avoid-version -rpath $(plugindir) |
| 78 |
|
| 79 |
test-logall: |
| 80 |
@echo '## Running plugin tests' |
