summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-02-24 15:16:26 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-02-24 15:16:26 +0000
commit5c06992e627154c3d590e890b5b7008df9384eb4 (patch)
tree368dfe6b67acf54491eba4523b1b853d20b90c0f
parentcf33a006dc3324a0a680454f76fc0648a9f562a1 (diff)
downloaddbus-5c06992e627154c3d590e890b5b7008df9384eb4.tar.gz
Use square brackets (m4 quoting) instead of changequote
For more details, see: http://www.gnu.org/software/autoconf/manual/html_node/Changequote-is-Evil.html
-rw-r--r--configure.in9
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index b043018f..049a7c21 100644
--- a/configure.in
+++ b/configure.in
@@ -1129,8 +1129,10 @@ if test x$dbus_win != xyes -a x$dbus_cygwin != xyes -a x$USE_MAINTAINER_MODE = x
fi
fi
-if test "x$GCC" = "xyes"; then
- changequote(,)dnl
+dnl This whole "if" block is in m4 quotes ([]) because it uses them
+dnl for character ranges internally. m4 macros cannot be used inside this
+dnl block.
+[if test "x$GCC" = "xyes"; then
case " $CFLAGS " in
*[\ \ ]-Wall[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wall" ;;
@@ -1272,8 +1274,7 @@ if test "x$GCC" = "xyes"; then
*) CFLAGS="$CFLAGS -pedantic" ;;
esac
fi
- changequote([,])dnl
-fi
+fi]
AC_SUBST(PIC_CFLAGS)
AC_SUBST(PIC_LDFLAGS)