--- /usr/share/aclocal/pkg.m4	2005-04-11 14:43:03.000000000 +0800
+++ m4macros/pkg.m4	2005-04-12 10:43:34.525212408 +0800
@@ -69,9 +69,9 @@ AC_ARG_VAR([$1][_LIBS], [linker flags fo
 
 pkg_failed=no
 AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS],
-	[_PKG_CONFIG([$1][_CFLAGS], [cflags], [[$2]])])
+	[_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])])
 AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS],
-	[_PKG_CONFIG([$1][_LIBS], [libs], [[$2]])])
+	[_PKG_CONFIG([$1][_LIBS], [libs], [$2])])
 
 if test $pkg_failed = yes; then
 	$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
@@ -79,17 +79,17 @@ if test $pkg_failed = yes; then
 	echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
 
 	ifelse([$4], , [AC_MSG_ERROR(dnl
-[[Package requirements ($2) were not met.
+[Package requirements ($2) were not met.
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
 Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
 to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.]])],
+more details.])],
 		[$4])
 elif test $pkg_failed = untried; then
 	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[[The pkg-config script could not be found or is too old.  Make sure it
+[The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -97,7 +97,7 @@ Alternatively you may set the $1_CFLAGS 
 to avoid the need to call pkg-config.  See the pkg-config man page for
 more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.]])],
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
 		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS