[poppler] poppler: ChangeLog,1.423,1.424 configure.ac,1.61,1.62

[Kristian Høgsberg]

Update of /cvs/poppler/poppler
In directory kemper:/tmp/cvs-serv20709

Modified Files:
	ChangeLog configure.ac 
Log Message:
2006-09-13  Kristian Høgsberg  <krh at redhat.com>

	* configure.ac: Tighten glib check (#7906), add check for C++
	compiler (#8048).



Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -d -r1.423 -r1.424
--- ChangeLog	12 Sep 2006 19:48:47 -0000	1.423
+++ ChangeLog	13 Sep 2006 20:25:03 -0000	1.424
@@ -1,3 +1,8 @@
+2006-09-13  Kristian Høgsberg  <krh at redhat.com>
+
+	* configure.ac: Tighten glib check (#7906), add check for C++
+	compiler (#8048).
+
 2006-09-11  Albert Astals Cid <aacid at kde.org>
 
 	* qt4/src/poppler-annotation.cc:

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- configure.ac	6 Sep 2006 23:54:30 -0000	1.61
+++ configure.ac	13 Sep 2006 20:25:03 -0000	1.62
@@ -7,6 +7,7 @@
 dnl ##### Checks for programs.
 AC_PROG_LIBTOOL
 AC_PROG_CC
+AC_PROG_CXX
 AC_ISC_POSIX
 AC_PROG_CC_STDC
 #if test -z "$CXX" -a "$CC" = "gcc"; then
@@ -196,7 +197,7 @@
               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)
+  PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0 glib >= 2.6)
 elif test x$enable_poppler_glib = xtry; then
   PKG_CHECK_MODULES(POPPLER_GLIB, gdk-2.0 >= 2.4.0,
                     [enable_poppler_glib="yes"],