[poppler] poppler: ChangeLog,1.255,1.256 configure.ac,1.37,1.38

[Albert Astals Cid]

Update of /cvs/poppler/poppler
In directory gabe:/tmp/cvs-serv28447

Modified Files:
	ChangeLog configure.ac 
Log Message:
	* configure.ac: Detect if gettimeofday is available, fixes for correct
        linking to Qt4 on windows
        * goo/GooTimer.[cc|h]: Only build if gettimeofday is available
        * poppler/Gfx.cc: Only use the timer for profiling if gettimeofday is
        available
        * poppler/GlobalParams.cc: Remove extra unlockGlobalParams that was
        making windows hang
        * splash/SplashFTFontEngine.cc: i need unistd.h on windows also
        * splash/SplashFontFile.cc: i need unistd.h on windows also


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- ChangeLog	8 Dec 2005 12:42:50 -0000	1.255
+++ ChangeLog	8 Dec 2005 18:17:42 -0000	1.256
@@ -1,5 +1,17 @@
 2005-12-08  Albert Astals Cid  <aacid at kde.org>
 
+	* configure.ac: Detect if gettimeofday is available, fixes for correct
+	linking to Qt4 on windows
+	* goo/GooTimer.[cc|h]: Only build if gettimeofday is available
+	* poppler/Gfx.cc: Only use the timer for profiling if gettimeofday is
+	available
+	* poppler/GlobalParams.cc: Remove extra unlockGlobalParams that was
+	making windows hang
+	* splash/SplashFTFontEngine.cc: i need unistd.h on windows also
+	* splash/SplashFontFile.cc: i need unistd.h on windows also
+
+2005-12-08  Albert Astals Cid  <aacid at kde.org>
+
 	* glib/Makefile.am:
 	* poppler/Makefile.am:
 	* qt/Makefile.am:

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- configure.ac	16 Sep 2005 18:21:38 -0000	1.37
+++ configure.ac	8 Dec 2005 18:17:42 -0000	1.38
@@ -16,6 +16,7 @@
 #fi
 AC_PROG_CXX
 AC_PROG_INSTALL
+AC_CHECK_FUNC(gettimeofday, AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [Defines if gettimeofday is available on your system]))
 
 dnl Enable these unconditionally.
 AC_DEFINE([A4_PAPER], [1], [Default to A4 paper.])
@@ -320,6 +321,7 @@
 qt4_test_include="QtCore/QCoreApplication"
 qt4_test_la_library="libQtCore.la"
 qt4_test_library="libQtCore.so"
+qt4_windows_test_library="QtCore4.dll"
 
 dnl Check for Qt4 headers
 AC_MSG_CHECKING([for Qt4 headers])
@@ -345,6 +347,12 @@
         qt4_libdir="$qt4_check"
         break
     fi
+
+    if test -r "$qt4_check/$qt4_windows_test_library" ; then
+        qt4_libdir="$qt4_check"
+        windows_qt="yes"
+        break
+    fi
 done
 AC_MSG_RESULT([$qt4_libdir])
 
@@ -356,7 +364,11 @@
 
 dnl Set the variables
 POPPLER_QT4_CXXFLAGS="-I$qt4_incdir"
-POPPLER_QT4_LIBS="-L$qt4_libdir -lQtCore -lQtGui"
+if test x$windows_qt = xyes; then
+	POPPLER_QT4_LIBS="-L$qt4_libdir -lQtCore4 -lQtGui4"
+else
+	POPPLER_QT4_LIBS="-L$qt4_libdir -lQtCore -lQtGui"
+fi
 
 AC_SUBST(POPPLER_QT4_CXXFLAGS)
 AC_SUBST(POPPLER_QT4_LIBS)