Attachment 7314 Details for Bug 7107 – Fixes for compilation using cygwin/mingw

[patch] Fixes for compilation using cygwin/mingw

poppler-cvs-20061009-win32-build-fixes.diff (text/plain), 1.97 KB, created by Peter Johanson on 2006-10-09 16:49:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Johanson

Created: 2006-10-09 16:49:04 UTC

Size: 1.97 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/poppler/poppler/configure.ac,v
>retrieving revision 1.65
>diff -a -u -r1.65 configure.ac
>--- configure.ac	21 Sep 2006 23:28:14 -0000	1.65
>+++ configure.ac	9 Oct 2006 23:39:56 -0000
>@@ -5,6 +5,7 @@
> AM_CONFIG_HEADER(poppler/poppler-config.h)
> 
> dnl ##### Checks for programs.
>+AC_LIBTOOL_WIN32_DLL
> AC_PROG_LIBTOOL
> AC_PROG_CC
> AC_PROG_CXX
>@@ -183,9 +184,9 @@
>               enable_poppler_glib=$enableval,
>               enable_poppler_glib="try")
> if test x$enable_poppler_glib = xyes; then
>-  PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib >= 2.6)
>+  PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6)
> elif test x$enable_poppler_glib = xtry; then
>-  PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0,
>+  PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6,
>                     [enable_poppler_glib="yes"],
>                     [enable_poppler_glib="no"])
> fi
>Index: glib/Makefile.am
>===================================================================
>RCS file: /cvs/poppler/poppler/glib/Makefile.am,v
>retrieving revision 1.17
>diff -a -u -r1.17 Makefile.am
>--- glib/Makefile.am	25 Sep 2006 20:43:18 -0000	1.17
>+++ glib/Makefile.am	9 Oct 2006 23:39:56 -0000
>@@ -88,7 +88,7 @@
> 	$(FONTCONFIG_LIBS)				\
> 	$(cairo_libs)
> 
>-libpoppler_glib_la_LDFLAGS = -version-info 1:0:0
>+libpoppler_glib_la_LDFLAGS = -no-undefined -version-info 1:0:0
> 
> noinst_PROGRAMS = test-poppler-glib
> 
>Index: poppler/Makefile.am
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/Makefile.am,v
>retrieving revision 1.25
>diff -a -u -r1.25 Makefile.am
>--- poppler/Makefile.am	18 Sep 2006 15:40:50 -0000	1.25
>+++ poppler/Makefile.am	9 Oct 2006 23:39:56 -0000
>@@ -96,7 +96,7 @@
> 	$(FREETYPE_LIBS)			\
> 	$(FONTCONFIG_LIBS)
> 
>-libpoppler_la_LDFLAGS = -version-info 1:0:0
>+libpoppler_la_LDFLAGS = -no-undefined -version-info 1:0:0
> 
> if ENABLE_XPDF_HEADERS
>

Actions: View | Splinter Review

Attachments on bug 7107: 5799 | 5801 | 7314 | 34268 | 36628 | 36629 | 36682 | 36683 | 36684 | 36685 | 36686 | 36725 | 36726 | 36727

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.