[poppler] poppler/m4: qt.m4,1.6,1.7

[Brad Hards]

Update of /cvs/poppler/poppler/m4
In directory kemper:/tmp/cvs-serv19905a/m4

Modified Files:
	qt.m4 
Log Message:
Switch to using pkg-config to find Qt4.


Index: qt.m4
===================================================================
RCS file: /cvs/poppler/poppler/m4/qt.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- qt.m4	31 Jan 2007 18:48:16 -0000	1.6
+++ qt.m4	4 Mar 2007 07:30:31 -0000	1.7
@@ -90,168 +90,3 @@
 ])
 
 
-# POPPLER_FIND_QT4(VARIABLE-PREFIX, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check whether the Qt4 libraries are available.
-#
-# --------------------------------------------------------------
-AC_DEFUN([POPPLER_FIND_QT4],
-[
-have_qt4=no
-dnl Search paths for Qt4 - not much real experience with this yet.
-qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
-qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
-
-if test -n "$QTDIR" ; then
-    qt4_incdirs="$QTDIR/include $qt4_incdirs"
-    qt4_libdirs="$QTDIR/lib $qt4_libdirs"
-fi
-
-dnl What to test
-qt4_test_include="QtCore/QCoreApplication"
-qt4_test_la_library="libQtCore.la"
-qt4_test_library="libQtCore.so"
-qt4_test_framework="QtCore.framework"
-qt4_windows_test_library="QtCore4.dll"
-
-dnl Check for Qt4 headers
-AC_MSG_CHECKING([for Qt4 headers])
-qt4_incdir="no"
-for it in $qt4_incdirs ; do
-    if test -r "$it/$qt4_test_include" ; then
-        qt4_incdir="$it"
-        break
-    fi
-done
-AC_MSG_RESULT([$qt4_incdir])
-
-dnl Check for Qt4 libraries
-AC_MSG_CHECKING([for Qt4 libraries])
-qt4_libdir="no"
-for qt4_check in $qt4_libdirs ; do
-    if test -r "$qt4_check/$qt4_test_la_library" ; then
-        qt4_libdir="$qt4_check"
-        break
-    fi
-
-    if test -r "$qt4_check/$qt4_test_library" ; then
-        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
-
-    if test -d "$qt4_check/$qt4_test_framework"; then
-        qt4_libdir="$qt4_check"
-        mac_qt="yes"
-        break
-    fi
-done
-AC_MSG_RESULT([$qt4_libdir])
-
-if test "x$qt4_libdir" != "xno" ; then
-    if test "x$qt4_incdir" != "xno" ; then
-        have_qt4=yes;
-    fi
-fi
-
-if test "x$have_qt4" == "xyes"; then
-    $1[]_CXXFLAGS="-I$qt4_incdir"
-    if test x$windows_qt = xyes; then
-        $1[]_LIBS="-L$qt4_libdir -lQtCore4 -lQtGui4 -lQtXml4"
-    elif test x$mac_qt = xyes; then
-        $1[]_LIBS="-L$qt4_libdir -Wl,-F$qt4_libdir -framework QtCore -framework QtGui -framework QtXml"
-    else
-        $1[]_LIBS="-L$qt4_libdir -lQtCore -lQtGui -lQtXml"
-    fi
-    ifelse([$2], , :, [$2])
-else
-    ifelse([$3], , [AC_MSG_FAILURE(dnl
-[Qt4 development libraries not found])],
-  	   [$3])
-fi
-])
-
-
-# POPPLER_FIND_QT4TEST(VARIABLE-PREFIX,
-#                      [ACTION-IF-FOUND],
-#                      [ACTION-IF-NOT-FOUND])
-#
-# Check whether the Qt4 libraries are available.
-#
-# --------------------------------------------------------------
-AC_DEFUN([POPPLER_FIND_QT4TEST],
-[
-have_qt4testlib=no
-
-qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include"
-qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib"
-
-if test -n "$QTDIR" ; then
-    qt4_incdirs="$QTDIR/include $qt4_incdirs"
-    qt4_libdirs="$QTDIR/lib $qt4_libdirs"
-fi
-
-dnl What to test
-qt4test_test_include="QtTest/QtTest"
-qt4test_test_la_library="libQtTest.la"
-qt4test_test_library="libQtTest.so"
-qt4test_test_framework="QtTest.framework"
-
-dnl Check for QtTestLib headers
-AC_MSG_CHECKING([for QtTestLib headers])
-qt4test_incdir="no"
-for it in $qt4_incdirs ; do
-    if test -r "$it/$qt4test_test_include" ; then
-        qt4test_incdir="$it"
-        break
-    fi
-done
-AC_MSG_RESULT([$qt4test_incdir])
-
-dnl Check for Qt4 libraries
-AC_MSG_CHECKING([for QtTestLib libraries])
-qt4test_libdir="no"
-for qt4test_check in $qt4_libdirs ; do
-    if test -r "$qt4test_check/$qt4test_test_la_library" ; then
-        qt4test_libdir="$qt4test_check"
-        break
-    fi
-
-    if test -r "$qt4test_check/$qt4test_test_library" ; then
-        qt4test_libdir="$qt4test_check"
-        break
-    fi
-
-    if test -d "$qt4test_check/$qt4test_test_framework" ; then
-        qt4test_libdir="$qt4test_check"
-        mac_test=yes
-        break
-    fi
-done
-AC_MSG_RESULT([$qt4test_libdir])
-
-if test "x$qt4test_libdir" != "xno" ; then
-    if test "x$qt4test_incdir" != "xno" ; then
-        have_qt4testlib=yes;
-    fi
-fi
-
-if test "x$have_qt4testlib" == "xyes"; then
-    $1[]_CXXFLAGS="-I$qt4test_incdir"
-    if test x$mac_test = xyes; then
-        $1[]_LIBS="-L$qt4test_libdir -Wl,-F$qt4test_libdir -framework QtTest"
-    else
-        $1[]_LIBS="-L$qt4test_libdir -lQtTest"
-    fi
-    ifelse([$2], , :, [$2])
-else
-    ifelse([$3], , [AC_MSG_FAILURE(dnl
-[Qt4 test libraries not found])],
-  	   [$3])
-fi
-])