[poppler] Branch 'poppler-0.10' - configure.ac

[Vincent Torri]

On Mon, 9 Mar 2009, Albert Astals Cid wrote:
>>> +dnl ##### Check for pkgconfig
>>> +AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
>>> +if test "x$HAVE_PKGCONFIG" = "xno"; then
>>> +  AC_MSG_ERROR("*** pkg-config not found ***")
>>> +fi
>>> +
>>
>> you should use PKG_PROG_PKG_CONFIG instead (macro that is in pkg.m4)
>
> Can you attach a patch please?

The patch is below:

diff --git a/configure.ac b/configure.ac
index d32f048..69eca91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,10 +22,7 @@ AC_CHECK_FUNC(gettimeofday, 
AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [Defines if gettimeo
  AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Defines if 
localtime_r is available on your system]))

  dnl ##### Check for pkgconfig
-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
-if test "x$HAVE_PKGCONFIG" = "xno"; then
-  AC_MSG_ERROR("*** pkg-config not found ***")
-fi
+PKG_PROG_PKG_CONFIG

  dnl Enable these unconditionally.
  AC_DEFINE([OPI_SUPPORT], [1], [Generate OPI comments in PS output.])