[poppler] Branch 'poppler-0.12' - configure.ac qt4/src qt/Makefile.am

[Albert Astals Cid]

 configure.ac        |    3 +++
 qt/Makefile.am      |    2 +-
 qt4/src/Makefile.am |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 7255a49b2adebdd33ca08a3be7e259c1b1d02555
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Sat Sep 26 15:01:35 2009 +0200

    Patch to make poppler work on Cygwin
    
    Bug 4195

diff --git a/configure.ac b/configure.ac
index 1fd49fa..d4a3303 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,9 @@ win32_libs=""
 create_shared_lib=""
 auto_import_flags=""
 case "$host_os" in
+  cygwin*)
+    create_shared_lib="-no-undefined"
+  ;;
   mingw*)
     win32_libs="-lgdi32"
     create_shared_lib="-no-undefined"
diff --git a/qt/Makefile.am b/qt/Makefile.am
index 8827d65..df0115c 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -30,7 +30,7 @@ libpoppler_qt_la_LIBADD = 			\
 	$(FREETYPE_LIBS)			\
 	$(FONTCONFIG_LIBS)
 
-libpoppler_qt_la_LDFLAGS = -version-info 2:0:0
+libpoppler_qt_la_LDFLAGS = -version-info 2:0:0 @create_shared_lib@
 
 if BUILD_SPLASH_OUTPUT
 
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
index 04620af..7e982e7 100644
--- a/qt4/src/Makefile.am
+++ b/qt4/src/Makefile.am
@@ -61,7 +61,7 @@ libpoppler_qt4_la_LIBADD += 			\
 	$(top_builddir)/poppler/libpoppler-arthur.la
 endif
 
-libpoppler_qt4_la_LDFLAGS = -version-info 5:0:2
+libpoppler_qt4_la_LDFLAGS = -version-info 5:0:2 @create_shared_lib@
 
 # This rule lets GNU make create any *.moc from the equivalent *.h
 .h.moc: