[poppler] configure.ac glib/demo glib/Makefile.am m4/libjpeg.m4

[Albert Astals Cid]

 configure.ac      |    2 +-
 glib/Makefile.am  |    2 +-
 glib/demo/info.cc |    1 +
 m4/libjpeg.m4     |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 957d7acb66635e9748c6bc7a31cdbbcbb8da9011
Author: Carlo Bramini <carlo.bramix at libero.it>
Date:   Sat Sep 27 17:23:20 2008 +0200

    Misc mingw fixes

diff --git a/configure.ac b/configure.ac
index 8129cf9..d208bd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ dnl Check for OS specific flags
 win32_libs=""
 create_shared_lib=""
 case "$host_os" in
-  mingw|mingw32)
+  mingw*)
     win32_libs="-lgdi32"
     create_shared_lib="-no-undefined"
   ;;
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 95f46ff..885e7db 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -94,7 +94,7 @@ libpoppler_glib_la_LIBADD =				\
 	$(FONTCONFIG_LIBS)				\
 	$(cairo_libs)
 
-libpoppler_glib_la_LDFLAGS = -version-info 4:0:0
+libpoppler_glib_la_LDFLAGS = -version-info 4:0:0 @create_shared_lib@
 
 if BUILD_WITH_GDK
 noinst_PROGRAMS = test-poppler-glib
diff --git a/glib/demo/info.cc b/glib/demo/info.cc
index 7e22d18..574b0f5 100644
--- a/glib/demo/info.cc
+++ b/glib/demo/info.cc
@@ -18,6 +18,7 @@
 
 #include <gtk/gtk.h>
 
+#include "config.h"
 #include "info.h"
 #include "utils.h"
 
diff --git a/m4/libjpeg.m4 b/m4/libjpeg.m4
index 0733fe6..580dd78 100644
--- a/m4/libjpeg.m4
+++ b/m4/libjpeg.m4
@@ -68,7 +68,7 @@ KDE_FIND_JPEG_HELPER(6b, 6b,
 
 dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
 dnl requires system dependent includes loaded before it)
-jpeg_incdirs="`eval echo $includedir` /usr/include /usr/local/include "
+jpeg_incdirs="`eval echo $includedir` /usr/include /usr/local/include /mingw/include"
 AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=