From 73f4744912547622bf35d76a74d1e41d035a621b Mon Sep 17 00:00:00 2001
From: Giel van Schijndel <giel@wz2100.net>
Date: Sun, 28 Sep 2008 17:35:56 +0000
Subject: [PATCH] Move the version checks for pkg-config, xgettext and msgfmt
 out of autogen.sh and into configure.ac

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6093 4a71c877-e1ca-e34f-864e-861f7616d084
---
 autogen.sh   | 3 ---
 configure.ac | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 47d0082e6..f7a82e5df 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -145,9 +145,6 @@ not_version ()
   fi
 }
 
-version_check 1 "pkg-config" "http://pkgconfig.freedesktop.org/" 0 9 || DIE=1
-version_check 1 "xgettext" "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 15 || DIE=1
-version_check 1 "msgfmt" "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 15 || DIE=1
 version_check 1 "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 56 || DIE=1
 version_check 1 "automake" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 10 || DIE=1
 if [ "$DIE" -eq 1 ]; then
diff --git a/configure.ac b/configure.ac
index 4a2b9fedd..3872d4c7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,9 +40,11 @@ AC_GNU_SOURCE
 
 # Check for gettext
 AM_GNU_GETTEXT([external])
+AC_PROG_VERSION_CHECK([msgfmt xgettext], [0.15])
 
 # Check for pkg-config
 PKG_PROG_PKG_CONFIG
+AC_PROG_VERSION_CHECK([pkg-config], [0.9])
 
 
 # Check for compiler