From a7efbcc46a5cb9222d63729db0bad835b9b36398 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Thu, 14 Jul 2005 13:04:04 +0000
Subject: [PATCH] updates Author: hp Date: 2001-06-05 16:58:24 GMT updates

---
 AUTHORS   |  3 ++-
 ChangeLog |  4 ++++
 pkg.m4    | 37 ++-----------------------------------
 3 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 0a79d42..9c30eb3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,7 +2,8 @@ Original authors
 ----------------
 James Henstridge  <james@daa.com.au>    original pkg-config
 Tim Janik  <timj@gtk.org>               the PKG_CHECK_VERSION macro
+Havoc Pennington <hp@redhat.com>        rewrite in C
 
 Maintainer
 ----------
-Martijn van Beers  <martijn@eekeek.org>
+Havoc Pennington <hp@redhat.com>
diff --git a/ChangeLog b/ChangeLog
index 04804e5..ecf5ca2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-05  Havoc Pennington  <hp@redhat.com>
+
+	* pkg.m4: remove unrelated macros
+
 2001-05-20  Havoc Pennington  <hp@pobox.com>
 
 	* configure.in: revert package name change, just screwing things up.
diff --git a/pkg.m4 b/pkg.m4
index 8c78225..4d0afef 100644
--- a/pkg.m4
+++ b/pkg.m4
@@ -14,8 +14,8 @@ AC_DEFUN(PKG_CHECK_MODULES,
      echo "*** in your path, or set the PKG_CONFIG environment variable"
      echo "*** to the full path to pkg-config."
   else
-     if ! $PKG_CONFIG --atleast-pkgconfig-version 0.6.0; then
-        echo "*** Your version of pkg-config is too old. You need version 0.6.0 or newer."
+     if ! $PKG_CONFIG --atleast-pkgconfig-version 0.7.0; then
+        echo "*** Your version of pkg-config is too old. You need version 0.7.0 or newer."
      else
         AC_MSG_CHECKING(for $2)
 
@@ -48,36 +48,3 @@ AC_DEFUN(PKG_CHECK_MODULES,
      ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
   fi
 ])
-
-
-dnl Check if the C compiler accepts a certain C flag, and if so adds it to
-dnl CFLAGS
-AC_DEFUN(PKG_CHECK_CFLAG, [
-  AC_MSG_CHECKING(if C compiler accepts $1)
-  save_CFLAGS="$CFLAGS"
-
-  dnl make sure we add it only once
-  dnl this one doesn't seem to work: *[\ \	]$1[\ \ ]*) ;;
-  case " $CFLAGS " in
-  *\ $1\ *) echo $ac_n "(already in CFLAGS) ... " ;;
-  *\ $1\	*) echo $ac_n "(already in CFLAGS) ... " ;;
-  *\	$1\ *) echo $ac_n "(already in CFLAGS) ... " ;;
-  *\	$1\	*) echo $ac_n "(already in CFLAGS) ... " ;;
-  *) CFLAGS="$CFLAGS $1" ;;
-  esac
-
-  AC_TRY_COMPILE([#include <stdio.h>], [printf("hello");],
-	         [ AC_MSG_RESULT(yes)],dnl
-	         [ CFLAGS="$save_CFLAGS" AC_MSG_RESULT(no) ])
-])
-
-dnl add $ACLOCAL_FLAGS (and optionally more dirs) to the aclocal
-dnl commandline, so make can work even if it needs to rerun aclocal
-AC_DEFUN(PKG_ACLOCALFLAGS,
-[
-  test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
-  for i in "$1"; do
-    ACLOCAL="$ACLOCAL -I $i"
-  done
-])
-- 
2.39.5