--- a/ChangeLog	Tue Sep 27 01:47:55 2011 +0100
+++ b/ChangeLog	Tue Sep 27 01:51:32 2011 +0100
@@ -1,3 +1,13 @@
+2011-09-27  Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	Always quote using '[' and ']' in macro calls.
+	(IT_CHECK_FOR_JPEG): Replace quotation marks
+	with '[' and ']'.
+	(IT_CHECK_FOR_GIF): Likewise.
+	(IT_CHECK_FOR_CUPS): Likewise.
+	(IT_CHECK_FOR_SYSCALLS): Likewise.
+
 2011-09-27  Andrew John Hughes  <ahughes@redhat.com>
 
 	* acinclude.m4:

--- a/acinclude.m4	Tue Sep 27 01:47:55 2011 +0100
+++ b/acinclude.m4	Tue Sep 27 01:51:32 2011 +0100
@@ -1997,9 +1997,9 @@
   if test x"${ENABLE_SYSTEM_JPEG}" = "xyes"; then
     dnl Check for JPEG headers and libraries.
     AC_CHECK_LIB([jpeg], [main],
-        , [AC_MSG_ERROR("Could not find JPEG library; install JPEG or build with --disable-system-jpeg to use the in-tree copy.")])
+        , [AC_MSG_ERROR([Could not find JPEG library; install JPEG or build with --disable-system-jpeg to use the in-tree copy.])])
     AC_CHECK_HEADER([jpeglib.h],
-        , [AC_MSG_ERROR("Could not find JPEG header; install JPEG or build with --disable-system-jpeg to use the in-tree copy.")])
+        , [AC_MSG_ERROR([Could not find JPEG header; install JPEG or build with --disable-system-jpeg to use the in-tree copy.])])
     JPEG_LIBS="-ljpeg"
     AC_SUBST(JPEG_LIBS)
   fi
@@ -2048,9 +2048,9 @@
   if test x"${ENABLE_SYSTEM_GIF}" = "xyes"; then
     dnl Check for GIF headers and libraries.
     AC_CHECK_LIB([gif], [main],
-        , [AC_MSG_ERROR("Could not find GIF library; install GIF or build with --disable-system-gif to use the in-tree copy.")])
+        , [AC_MSG_ERROR([Could not find GIF library; install GIF or build with --disable-system-gif to use the in-tree copy.])])
     AC_CHECK_HEADER([gif_lib.h],
-        , [AC_MSG_ERROR("Could not find GIF header; install GIF or build with --disable-system-gif to use the in-tree copy.")])
+        , [AC_MSG_ERROR([Could not find GIF header; install GIF or build with --disable-system-gif to use the in-tree copy.])])
     GIF_LIBS="-lgif"
     AC_SUBST(GIF_LIBS)
   fi
@@ -2140,9 +2140,9 @@
 [
   dnl Check for CUPS headers and libraries.
   AC_CHECK_LIB([cups], [cupsServer],
-      , [AC_MSG_ERROR("Could not find CUPS library; install CUPS.")])
+      , [AC_MSG_ERROR([Could not find CUPS library; install CUPS.])])
   AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],
-      , [AC_MSG_ERROR("Could not find CUPS headers; install CUPS (including cups-devel on binary distros).")])
+      , [AC_MSG_ERROR([Could not find CUPS headers; install CUPS (including cups-devel on binary distros).])])
   CUPS_LIBS="-lcups"
   AC_SUBST(CUPS_LIBS)
 ])
@@ -2164,7 +2164,7 @@
     AC_CHECK_FUNCS([openat64 fstatat64 fgetxattr fsetxattr fremovexattr flistxattr unlinkat renameat futimesat fdopendir epoll_create epoll_ctl epoll_wait],,
       [AC_MSG_ERROR([Could not find required syscalls; check config.log and use --disable-compile-against-syscalls if necessary.])])
     AC_CHECK_HEADERS([sys/epoll.h attr/xattr.h],
-      , [AC_MSG_ERROR("Could not find required system headers; install the appropriate files or use --disable-compile-against-syscalls if necessary.")])
+      , [AC_MSG_ERROR([Could not find required system headers; install the appropriate files or use --disable-compile-against-syscalls if necessary.])])
   fi
   AM_CONDITIONAL(USE_SYSCALL_COMPILATION, test x"${ENABLE_SYSCALL_COMPILATION}" = "xyes")
   AC_SUBST(ENABLE_SYSCALL_COMPILATION)