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

[Albert Astals Cid]

 configure.ac |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit cc500650c51400976ad231f2d1b566cdeadb9e24
Author: Vincent Torri <vtorri at univ-evry.fr>
Date:   Wed Mar 11 00:39:59 2009 +0100

    remove the fortran check during the initialisation of libtool

diff --git a/configure.ac b/configure.ac
index 31e97c8..cc4f59c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@ AM_CONFIG_HEADER(poppler/poppler-config.h)
 
 dnl ##### Initialize libtool.
 AC_LIBTOOL_WIN32_DLL
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
 AC_PROG_LIBTOOL
 
 dnl ##### Checks for programs.
commit 23e6f21435c11e493050d28143bfb881de65b18d
Author: Vincent Torri <vtorri at univ-evry.fr>
Date:   Wed Mar 11 00:37:11 2009 +0100

    Add AC_CONFIG_MACRO_DIR([m4])
    
    It is used by autoreconf to trace changes in m4 macros that are in the m4/ subdirectory.

diff --git a/configure.ac b/configure.ac
index 4f8c502..31e97c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 AC_PREREQ(2.59)
 AC_INIT(poppler, 0.10.4)
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 AM_CONFIG_HEADER(config.h)
 AM_CONFIG_HEADER(poppler/poppler-config.h)
commit 8706efd182ff3f3927d731e9fc46717c161b40e8
Author: Vincent Torri <vtorri at univ-evry.fr>
Date:   Wed Mar 11 00:36:27 2009 +0100

    Better check for pkg-config

diff --git a/configure.ac b/configure.ac
index 751b9e9..4f8c502 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.])