[poppler] poppler: ChangeLog, 1.43, 1.44 Makefile.am, 1.2, 1.3 configure.ac, 1.12, 1.13 poppler-qt.pc.in, NONE, 1.1

[Jeff Muizelaar]

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

Modified Files:
	ChangeLog Makefile.am configure.ac 
Added Files:
	poppler-qt.pc.in 
Log Message:
2005-04-06  Jeff Muizelaar  <jrmuizel at nit.ca>

        * Makefile.am, configure.ac: Add configuration for qt wrapper.

        * poppler-qt.pc.in:
        * qt/Makefile.am:
        * qt/poppler-document.cc:
        * qt/poppler-page.cc:
        * qt/poppler-private.h:
        * qt/poppler-qt.h:
        * qt/test-poppler-qt.cpp:
        New files.



Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- ChangeLog	5 Apr 2005 17:46:44 -0000	1.43
+++ ChangeLog	6 Apr 2005 14:39:40 -0000	1.44
@@ -1,3 +1,16 @@
+2005-04-06  Jeff Muizelaar  <jrmuizel at nit.ca>
+
+	* Makefile.am, configure.ac: Add configuration for qt wrapper.
+	
+	* poppler-qt.pc.in:
+	* qt/Makefile.am:
+	* qt/poppler-document.cc:
+	* qt/poppler-page.cc:
+	* qt/poppler-private.h:
+	* qt/poppler-qt.h:
+	* qt/test-poppler-qt.cpp:
+	New files.
+
 2005-04-05  Kristian Høgsberg  <krh at redhat.com>
 
 	* NEWS: Attempt to sum up changes since 0.1.2.

Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	20 Mar 2005 00:35:21 -0000	1.2
+++ Makefile.am	6 Apr 2005 14:39:40 -0000	1.3
@@ -12,17 +12,24 @@
 glib_pc_file = poppler-glib.pc
 endif
 
-SUBDIRS = goo fofi $(splash_subdir) poppler $(glib_subdir) test
+if BUILD_POPPLER_QT
+qt_subdir = qt
+qt_pc_file = poppler-qt.pc
+endif
+
+SUBDIRS = goo fofi $(splash_subdir) poppler $(glib_subdir) $(qt_subdir) test
 
 EXTRA_DIST =					\
 	README-XPDF				\
 	poppler.pc.in				\
 	poppler-cairo.pc.in			\
-	poppler-splash.pc.in
+	poppler-splash.pc.in			\
+	poppler-qt.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =				\
 	poppler.pc				\
 	$(cairo_pc_file)			\
 	$(splash_pc_file)			\
-	$(glib_pc_file)
+	$(glib_pc_file)				\
+	$(qt_pc_file)

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- configure.ac	5 Apr 2005 17:46:44 -0000	1.12
+++ configure.ac	6 Apr 2005 14:39:40 -0000	1.13
@@ -180,6 +180,65 @@
 fi
 AM_CONDITIONAL(BUILD_POPPLER_GLIB, test x$enable_poppler_glib = xyes)
 
+AC_ARG_ENABLE(poppler-qt,
+	      AC_HELP_STRING([--disable-poppler-qt],
+			     [Don't compile poppler qt wrapper.]),
+	      enable_poppler_qt=$enableval,
+	      enable_poppler_qt="try")
+# Qt detection
+AC_PATH_PROG(QT_MOC, moc, no)
+
+have_qt=no
+AC_MSG_CHECKING([for qglobal.h])
+if test -n "$QTDIR" -a -f "$QTDIR/include/qglobal.h"; then
+    have_qt=yes
+    POPPLER_QT_CXXFLAGS="-I$QTDIR/include"
+else
+    for dir in "${prefix}/include/qt" "/usr/include/qt-3.1" "/usr/include/qt3" "/usr/include/qt" "/usr/lib/qt/include" "/usr/lib/qt-3.1/include"; do
+        if test -f "$dir/qglobal.h"; then
+            have_qt=yes
+            POPPLER_QT_CXXFLAGS="-I$dir"
+       fi
+    done
+fi
+if test x"$have_qt" = x"yes"; then
+   AC_MSG_RESULT([found])
+else
+   AC_MSG_RESULT([not found])
+fi
+
+dnl linking to kdecore will give us a bit of help from libtool
+if (! kde-config >& /dev/null); then
+    have_qt=no
+else
+    kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
+    if test -z $kdelibs -o ! -f $kdelibs/libkdecore.la; then
+        have_qt=no
+    else
+        POPPLER_QT_LIBS="$kdelibs/libkdecore.la /usr/lib/libqt-mt.la"
+    fi
+fi
+
+if test x$have_qt = xno ; then
+    AC_MSG_WARN([Qt development libraries not found])
+fi
+
+if test x$enable_poppler_qt = xyes; then
+  if test x$have_qt = xno; then
+    AC_MSG_ERROR([Qt integration explicitly required, and Qt libraries not found])
+  fi
+elif test x$enable_poppler_qt = xtry; then
+  if test x$have_qt = xyes; then
+    enable_poppler_qt="yes"
+  else
+    enable_poppler_qt="no"
+  fi
+fi
+AM_CONDITIONAL(BUILD_POPPLER_QT, test x$enable_poppler_glib = xyes)
+
+dnl Qt flags
+AC_SUBST(POPPLER_QT_CXXFLAGS)
+AC_SUBST(POPPLER_QT_LIBS)
 
 AC_ARG_ENABLE(gtk-test,
               AC_HELP_STRING([--disable-gtk-test],
@@ -224,15 +283,18 @@
 poppler/Makefile
 glib/Makefile
 test/Makefile
+qt/Makefile
 poppler.pc
 poppler-cairo.pc
 poppler-splash.pc
-poppler-glib.pc])
+poppler-glib.pc
+poppler-qt.pc])
 
 
 echo ""
 echo "Building poppler with support for:"
 echo "  splash output: $enable_splash_output"
 echo "  cairo output:  $enable_cairo_output"
+echo "  qt wrapper:    $enable_poppler_qt"
 echo "  glib wrapper:  $enable_poppler_glib"
 echo "  use libjpeg:   $enable_libjpeg"

--- NEW FILE: poppler-qt.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: poppler-qt
Description: Qt bindings for poppler
Version: @VERSION@

Libs: -L${libdir} -lpoppler-qt
Cflags: -I${includedir}/poppler