diff --git a/m4/ogg.m4 b/m4/ogg.m4
index 0f428756..219268ba 100644
--- a/m4/ogg.m4
+++ b/m4/ogg.m4
@@ -9,10 +9,18 @@ AC_DEFUN(XIPH_PATH_OGG,
 [dnl 
 dnl Get the cflags and libraries
 dnl
-AC_ARG_WITH(ogg,[  --with-ogg=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
-AC_ARG_WITH(ogg-libraries,[  --with-ogg-libraries=DIR   Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
-AC_ARG_WITH(ogg-includes,[  --with-ogg-includes=DIR   Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
-AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
+AC_ARG_WITH([ogg],
+  [  --with-ogg=PFX           prefix where libogg is installed (optional)],
+  [ogg_prefix="$withval"], [ogg_prefix=""])
+AC_ARG_WITH([ogg-libraries],
+  [  --with-ogg-libraries=DIR directory where libogg library is installed (optional)], [ogg_libraries="$withval"], [ogg_libraries=""])
+AC_ARG_WITH([ogg-includes],
+  [  --with-ogg-includes=DIR  directory where libogg header files are
+                           installed (optional)],
+  [ogg_includes="$withval"], [ogg_includes=""])
+AC_ARG_ENABLE([oggtest],
+  [  --disable-oggtest       do not try to compile and run a test Ogg program],,
+  [enable_oggtest=yes])
 
   if test "x$ogg_libraries" != "x" ; then
     OGG_LIBS="-L$ogg_libraries"
diff --git a/m4/vorbis.m4 b/m4/vorbis.m4
index d311a410..0cfe3be0 100644
--- a/m4/vorbis.m4
+++ b/m4/vorbis.m4
@@ -10,10 +10,20 @@ AC_DEFUN(XIPH_PATH_VORBIS,
 [dnl 
 dnl Get the cflags and libraries
 dnl
-AC_ARG_WITH(vorbis,[  --with-vorbis=PFX   Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="")
-AC_ARG_WITH(vorbis-libraries,[  --with-vorbis-libraries=DIR   Directory where libvorbis library is installed (optional)], vorbis_libraries="$withval", vorbis_libraries="")
-AC_ARG_WITH(vorbis-includes,[  --with-vorbis-includes=DIR   Directory where libvorbis header files are installed (optional)], vorbis_includes="$withval", vorbis_includes="")
-AC_ARG_ENABLE(vorbistest, [  --disable-vorbistest       Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes)
+AC_ARG_WITH([vorbis],
+  [  --with-vorbis=PFX           prefix where libvorbis is installed (optional)],
+  [vorbis_prefix="$withval"], [vorbis_prefix=""])
+AC_ARG_WITH([vorbis-libraries],
+  [  --with-vorbis-libraries=DIR directory where libvorbis library is
+                              installed (optional)],
+  [vorbis_libraries="$withval"], [vorbis_libraries=""])
+AC_ARG_WITH([vorbis-includes],
+  [  --with-vorbis-includes=DIR  directory where libvorbis header files are
+                              installed (optional)],
+  [vorbis_includes="$withval"], [vorbis_includes=""])
+AC_ARG_ENABLE([vorbistest],
+  [  --disable-vorbistest    do not try to compile and run a test Vorbis program],,
+  [enable_vorbistest=yes])
 
   if test "x$vorbis_libraries" != "x" ; then
     VORBIS_LIBS="-L$vorbis_libraries"