Use AS_HELP_STRING to make the --help output more readable

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/autoconf/alsa.m4 b/autoconf/alsa.m4
index 2b65bc6..c4b7d94 100644 (file)
--- a/autoconf/alsa.m4
+++ b/autoconf/alsa.m4
@@ -25,18 +25,20 @@ dnl
 dnl Get the cflags and libraries for alsa
 dnl
 AC_ARG_WITH(alsa-prefix,
-[  --with-alsa-prefix=PFX  Prefix where Alsa library is installed(optional)],
-[alsa_prefix="$withval"], [alsa_prefix=""])
+           AS_HELP_STRING([--with-alsa-prefix=PFX],
+                          [Prefix where Alsa library is installed(optional)]),
+           [alsa_prefix="$withval"], [alsa_prefix=""])
 
 AC_ARG_WITH(alsa-inc-prefix,
-[  --with-alsa-inc-prefix=PFX  Prefix where include libraries are (optional)],
-[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
+           AS_HELP_STRING([--with-alsa-inc-prefix=PFX],
+                          [Prefix where include libraries are (optional)]),
+           [alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
 
 dnl FIXME: this is not yet implemented
 AC_ARG_ENABLE(alsatest,
-[  --disable-alsatest      Do not try to compile and run a test Alsa program],
-[enable_alsatest=no],
-[enable_alsatest=yes])
+             AS_HELP_STRING([--disable-alsatest],
+                            [Do not try to compile and run a test Alsa program]),
+             [enable_alsatest=no], [enable_alsatest=yes])
 
 dnl Add any special include directories
 AC_MSG_CHECKING(for ALSA CFLAGS)

diff --git a/autoconf/ao.m4 b/autoconf/ao.m4
index a852ad8..e737039 100644 (file)
--- a/autoconf/ao.m4
+++ b/autoconf/ao.m4
@@ -10,10 +10,21 @@ AC_DEFUN([XIPH_PATH_AO],
 [dnl 
 dnl Get the cflags and libraries
 dnl
-AC_ARG_WITH(ao,[  --with-ao=PFX   Prefix where libao is installed (optional)], ao_prefix="$withval", ao_prefix="")
-AC_ARG_WITH(ao-libraries,[  --with-ao-libraries=DIR   Directory where libao library is installed (optional)], ao_libraries="$withval", ao_libraries="")
-AC_ARG_WITH(ao-includes,[  --with-ao-includes=DIR   Directory where libao header files are installed (optional)], ao_includes="$withval", ao_includes="")
-AC_ARG_ENABLE(aotest, [  --disable-aotest       Do not try to compile and run a test ao program],, enable_aotest=yes)
+AC_ARG_WITH(ao,
+           AS_HELP_STRING([--with-ao=PFX], [Prefix where libao is installed (optional)]),
+                          [ao_prefix="$withval"], [ao_prefix=""])
+AC_ARG_WITH(ao-libraries,
+           AS_HELP_STRING([--with-ao-libraries=DIR],
+                          [Directory where libao library is installed (optional)]),
+           [ao_libraries="$withval"], [ao_libraries=""])
+AC_ARG_WITH(ao-includes,
+           AS_HELP_STRING([--with-ao-includes=DIR],
+                          [Directory where libao header files are installed (optional)]),
+           [ao_includes="$withval"], [ao_includes=""])
+AC_ARG_ENABLE(aotest,
+             AS_HELP_STRING([--disable-aotest],
+                            [Do not try to compile and run a test ao program]),,
+             [enable_aotest=yes])
 
 
   if test "x$ao_libraries" != "x" ; then

diff --git a/autoconf/arts.m4 b/autoconf/arts.m4
index f6b1d94..37b2076 100644 (file)
--- a/autoconf/arts.m4
+++ b/autoconf/arts.m4
@@ -13,10 +13,14 @@ AC_DEFUN([AM_PATH_ARTS],
        [dnl 
 dnl Get the cflags and libraries from the arts-config script
 dnl
-AC_ARG_WITH(arts-prefix,[  --with-arts-prefix=PFX   Prefix where ARTS is installed (optional)],
-       arts_prefix="$withval", arts_prefix="")
-AC_ARG_ENABLE(artstest, [  --disable-artstest       Do not try to compile and run a test ARTS program],
-       , enable_artstest=yes)
+AC_ARG_WITH(arts-prefix,
+           AS_HELP_STRING([--with-arts-prefix=PFX],
+                          [Prefix where ARTS is installed (optional)]),
+           arts_prefix="$withval", arts_prefix="")
+AC_ARG_ENABLE(artstest,
+             AS_HELP_STRING([--disable-artstest],
+                            [Do not try to compile and run a test ARTS program]),
+             , enable_artstest=yes)
 
   if test x$arts_prefix != x ; then
      arts_args="$arts_args --prefix=$arts_prefix"

diff --git a/autoconf/esd.m4 b/autoconf/esd.m4
index 24666c9..3c0587d 100644 (file)
--- a/autoconf/esd.m4
+++ b/autoconf/esd.m4
@@ -11,12 +11,18 @@ AC_DEFUN([AM_PATH_ESD],
 [dnl 
 dnl Get the cflags and libraries from the esd-config script
 dnl
-AC_ARG_WITH(esd-prefix,[  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)],
-            esd_prefix="$withval", esd_prefix="")
-AC_ARG_WITH(esd-exec-prefix,[  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
-            esd_exec_prefix="$withval", esd_exec_prefix="")
-AC_ARG_ENABLE(esdtest, [  --disable-esdtest       Do not try to compile and run a test ESD program],
-                   , enable_esdtest=yes)
+AC_ARG_WITH(esd-prefix,
+           AS_HELP_STRING([--with-esd-prefix=PFX],
+                          [Prefix where ESD is installed (optional)]),
+            [esd_prefix="$withval"], [esd_prefix=""])
+AC_ARG_WITH(esd-exec-prefix,
+           AS_HELP_STRING([--with-esd-exec-prefix=PFX],
+                          [Exec prefix where ESD is installed (optional)]),
+            [esd_exec_prefix="$withval"], [esd_exec_prefix=""])
+AC_ARG_ENABLE(esdtest,
+             AS_HELP_STRING([--disable-esdtest],
+                            [Do not try to compile and run a test ESD program]),
+                   , [enable_esdtest=yes])
 
   if test x$esd_exec_prefix != x ; then
      esd_args="$esd_args --exec-prefix=$esd_exec_prefix"

diff --git a/autoconf/gtk-2.0.m4 b/autoconf/gtk-2.0.m4
index 36a1f9f..2f135d0 100644 (file)
--- a/autoconf/gtk-2.0.m4
+++ b/autoconf/gtk-2.0.m4
@@ -9,8 +9,10 @@ AC_DEFUN([AM_PATH_GTK_2_0],
 [dnl 
 dnl Get the cflags and libraries from pkg-config
 dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-                   , enable_gtktest=yes)
+AC_ARG_ENABLE(gtktest,
+             AS_HELP_STRING([--disable-gtktest],
+                            [do not try to compile and run a test GTK+ program]),
+             , [enable_gtktest=yes])
 
   pkg_config_args=gtk+-2.0
   for module in . $4

diff --git a/autoconf/gtk.m4 b/autoconf/gtk.m4
index f2dd472..a6f067a 100644 (file)
--- a/autoconf/gtk.m4
+++ b/autoconf/gtk.m4
@@ -8,12 +8,18 @@ AC_DEFUN([AM_PATH_GTK],
 [dnl 
 dnl Get the cflags and libraries from the gtk-config script
 dnl
-AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
-            gtk_config_prefix="$withval", gtk_config_prefix="")
-AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
-            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
-                   , enable_gtktest=yes)
+AC_ARG_WITH(gtk-prefix,
+           AS_HELP_STRING([--with-gtk-prefix=PFX],
+                          [Prefix where GTK is installed (optional)]),
+            [gtk_config_prefix="$withval"], [gtk_config_prefix=""])
+AC_ARG_WITH(gtk-exec-prefix,
+           AS_HELP_STRING([--with-gtk-exec-prefix=PFX],
+                          [Exec prefix where GTK is installed (optional)]),
+           [gtk_config_exec_prefix="$withval"], [gtk_config_exec_prefix=""])
+AC_ARG_ENABLE(gtktest,
+             AS_HELP_STRING([--disable-gtktest],
+                            [Do not try to compile and run a test GTK program]),
+             , [enable_gtktest=yes])
 
   for module in . $4
   do

diff --git a/autoconf/libFLAC.m4 b/autoconf/libFLAC.m4
index b6950e7..e4573a8 100644 (file)
--- a/autoconf/libFLAC.m4
+++ b/autoconf/libFLAC.m4
@@ -8,10 +8,22 @@ AC_DEFUN([AM_PATH_LIBFLAC],
 [dnl 
 dnl Get the cflags and libraries
 dnl
-AC_ARG_WITH(libFLAC,[  --with-libFLAC=PFX   Prefix where libFLAC is installed (optional)], libFLAC_prefix="$withval", libFLAC_prefix="")
-AC_ARG_WITH(libFLAC-libraries,[  --with-libFLAC-libraries=DIR   Directory where libFLAC library is installed (optional)], libFLAC_libraries="$withval", libFLAC_libraries="")
-AC_ARG_WITH(libFLAC-includes,[  --with-libFLAC-includes=DIR   Directory where libFLAC header files are installed (optional)], libFLAC_includes="$withval", libFLAC_includes="")
-AC_ARG_ENABLE(libFLACtest, [  --disable-libFLACtest       Do not try to compile and run a test libFLAC program],, enable_libFLACtest=yes)
+AC_ARG_WITH(libFLAC,
+           AS_HELP_STRING([--with-libFLAC=PFX],
+                          [Prefix where libFLAC is installed (optional)]),
+           [libFLAC_prefix="$withval"], [libFLAC_prefix=""])
+AC_ARG_WITH(libFLAC-libraries,
+           AS_HELP_STRING([--with-libFLAC-libraries=DIR],
+                          [Directory where libFLAC library is installed (optional)]),
+                          [libFLAC_libraries="$withval"], [libFLAC_libraries=""])
+AC_ARG_WITH(libFLAC-includes,
+           AS_HELP_STRING([--with-libFLAC-includes=DIR],
+                          [Directory where libFLAC header files are installed (optional)]),
+                          [libFLAC_includes="$withval"], [libFLAC_includes=""])
+AC_ARG_ENABLE(libFLACtest,
+             AS_HELP_STRING([--disable-libFLACtest],
+                            [Do not try to compile and run a test libFLAC program]),,
+                            [enable_libFLACtest=yes])
 
   if test "x$libFLAC_libraries" != "x" ; then
     LIBFLAC_LIBS="-L$libFLAC_libraries"

diff --git a/autoconf/libOggFLAC.m4 b/autoconf/libOggFLAC.m4
index 9b5f6d2..5188e85 100644 (file)
--- a/autoconf/libOggFLAC.m4
+++ b/autoconf/libOggFLAC.m4
@@ -8,10 +8,22 @@ AC_DEFUN([AM_PATH_LIBOGGFLAC],
 [dnl 
 dnl Get the cflags and libraries
 dnl
-AC_ARG_WITH(libOggFLAC,[  --with-libOggFLAC=PFX   Prefix where libOggFLAC is installed (optional)], libOggFLAC_prefix="$withval", libOggFLAC_prefix="")
-AC_ARG_WITH(libOggFLAC-libraries,[  --with-libOggFLAC-libraries=DIR   Directory where libOggFLAC library is installed (optional)], libOggFLAC_libraries="$withval", libOggFLAC_libraries="")
-AC_ARG_WITH(libOggFLAC-includes,[  --with-libOggFLAC-includes=DIR   Directory where libOggFLAC header files are installed (optional)], libOggFLAC_includes="$withval", libOggFLAC_includes="")
-AC_ARG_ENABLE(libOggFLACtest, [  --disable-libOggFLACtest       Do not try to compile and run a test libOggFLAC program],, enable_libOggFLACtest=yes)
+AC_ARG_WITH(libOggFLAC,
+           AS_HELP_STRING([--with-libOggFLAC=PFX],
+                          [Prefix where libOggFLAC is installed (optional)]),
+           [libOggFLAC_prefix="$withval"], [libOggFLAC_prefix=""])
+AC_ARG_WITH(libOggFLAC-libraries,
+           AS_HELP_STRING([--with-libOggFLAC-libraries=DIR],
+                          [Directory where libOggFLAC library is installed (optional)]),
+           [libOggFLAC_libraries="$withval"], [libOggFLAC_libraries=""])
+AC_ARG_WITH(libOggFLAC-includes,
+           AS_HELP_STRING([--with-libOggFLAC-includes=DIR],
+                          [Directory where libOggFLAC header files are installed (optional)]),
+           [libOggFLAC_includes="$withval"], [libOggFLAC_includes=""])
+AC_ARG_ENABLE(libOggFLACtest,
+             AS_HELP_STRING([--disable-libOggFLACtest],
+                            [Do not try to compile and run a test libOggFLAC program]),,
+             [enable_libOggFLACtest=yes])
 
   if test "x$libOggFLAC_libraries" != "x" ; then
     LIBOGGFLAC_LIBS="-L$libOggFLAC_libraries"

diff --git a/autoconf/ogg.m4 b/autoconf/ogg.m4
index 0e1f1ab..9d93831 100644 (file)
--- a/autoconf/ogg.m4
+++ b/autoconf/ogg.m4
@@ -9,10 +9,22 @@ 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,
+           AS_HELP_STRING([--with-ogg=PFX],
+                          [Prefix where libogg is installed (optional)]),
+           [ogg_prefix="$withval"], [ogg_prefix=""])
+AC_ARG_WITH(ogg-libraries,
+           AS_HELP_STRING([--with-ogg-libraries=DIR],
+                          [Directory where libogg library is installed (optional)]),
+           [ogg_libraries="$withval"], [ogg_libraries=""])
+AC_ARG_WITH(ogg-includes,
+           AS_HELP_STRING([--with-ogg-includes=DIR],
+                          [Directory where libogg header files are installed (optional)]),
+           [ogg_includes="$withval"], [ogg_includes=""])
+AC_ARG_ENABLE(oggtest,
+             AS_HELP_STRING([--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/autoconf/vorbis.m4 b/autoconf/vorbis.m4
index 300cc6c..ce4ffc2 100644 (file)
--- a/autoconf/vorbis.m4
+++ b/autoconf/vorbis.m4
@@ -10,10 +10,22 @@ 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,
+           AS_HELP_STRING([--with-vorbis=PFX],
+                          [Prefix where libvorbis is installed (optional)]),
+           [vorbis_prefix="$withval"], [vorbis_prefix=""])
+AC_ARG_WITH(vorbis-libraries,
+           AS_HELP_STRING([--with-vorbis-libraries=DIR],
+                          [Directory where libvorbis library is installed (optional)]),
+           [vorbis_libraries="$withval"], [vorbis_libraries=""])
+AC_ARG_WITH(vorbis-includes,
+           AS_HELP_STRING([--with-vorbis-includes=DIR],
+                          [Directory where libvorbis header files are installed (optional)]),
+           [vorbis_includes="$withval"], [vorbis_includes=""])
+AC_ARG_ENABLE(vorbistest,
+             AS_HELP_STRING([--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"

diff --git a/configure.in b/configure.in
index 91fa9db..ee04039 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -69,8 +69,8 @@ CONTAINS_INIT
 dnl "--enable-debug" turnes -g on.
 AC_MSG_CHECKING(if --enable-debug option specified)
 AC_ARG_ENABLE(debug,
-  [  --enable-debug          Build a debugging version.],
-  [timidity_cv_debug="yes"], [timidity_cv_debug="no"])
+             AS_HELP_STRING([--enable-debug], [Build a debugging version.]),
+             [timidity_cv_debug="yes"], [timidity_cv_debug="no"])
 if test "x$timidity_cv_debug" = "xyes"; then
   AC_DEFINE(DEBUG,1,Define to 1 if you are in debug mode)
   CFLAGS=${CFLAGS-"-g"}
@@ -108,7 +108,7 @@ fi
 
 dnl add --with-includes, --with-libraries
 AC_ARG_WITH(includes,
-  [  --with-includes=DIR     Specify include directories (colon separated)],
+  AS_HELP_STRING([--with-includes=DIR], [Specify include directories (colon separated)]),
   [ j=' '
     for i in `echo "$withval"|sed -e 's,:, ,g'`; do
       j="${j}-I${i} "
@@ -117,7 +117,7 @@ AC_ARG_WITH(includes,
   ])
 
 AC_ARG_WITH(libraries,
-  [  --with-libraries=DIR    Specify library directories (colon separated)],
+  AS_HELP_STRING([--with-libraries=DIR], [Specify library directories (colon separated)]),
   [ j=' '
     for i in `echo "$withval"|sed -e 's,:, ,g'`; do
       j="${j}-L${i} "
@@ -129,7 +129,7 @@ AC_ARG_WITH(libraries,
 dnl a bit hairly yet.(20020718:mput)
 dnl CPPFLAGS="$CPPFLAGS \$(DEF_PKGDATADIR) \$(DEF_PKGLIBDIR) \$(DEF_DEFAULT_PATH)"
 AC_ARG_WITH(default-path,
-  [  --with-default-path=DIR Where timidity.cfg is  (PREFIX/share/timidity)],
+  AS_HELP_STRING([--with-default-path=DIR], [Where timidity.cfg is  (PREFIX/share/timidity)]),
   [pkgdatadir=$withval],
   [
    if test "x$prefix" != "xNONE"; then
@@ -143,7 +143,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_PATH,"$tmpdefpath",place to install patches)
 AC_DEFINE(PKGDATADIR,DEFAULT_PATH,a compatibility matter. ignore it.)
 
 AC_ARG_WITH(module-dir,
-  [  --with-module-dir=DIR   Where to install interfaces (PREFIX/lib/timidity)],
+  AS_HELP_STRING([--with-module-dir=DIR], [Where to install interfaces (PREFIX/lib/timidity)]),
   [pkglibdir=$withval],
   [
    if test "x$prefix" != "xNONE"; then
@@ -156,8 +156,8 @@ tmplibdir="`eval \"echo ${pkglibdir}\"`"
 AC_DEFINE_UNQUOTED(PKGLIBDIR,"$tmplibdir",place to install modules)
 
 AC_ARG_WITH(xaw-resource-prefix,
-  [  --with-xaw-resource-prefix=DIR What prefix to install XAW's resource files to
-     (optinal)], [xawresdir=$withval], [])
+  AS_HELP_STRING([--with-xaw-resource-prefix=DIR], [What prefix to install XAW's resource files to (optinal)]),
+  [xawresdir=$withval], [])
 AM_CONDITIONAL(XAW_INSTALL_RESOURCE_FILES, test "x$xawresdir" != "x")
 AC_SUBST(xawresdir)
 
@@ -182,11 +182,11 @@ fi
 # Checks for target dependencies
 
 AC_ARG_WITH(elf,
-  [  --with-elf              create ELF shared object instead of AOUT ],
+  AS_HELP_STRING([--with-elf], [create ELF shared object instead of AOUT]),
   [ ELFFORMAT=$withval ], [ ELFFORMAT="yes" ])
 
 # AC_ARG_WITH(simd,
-#  [  --with-simd             create SIMD friendly binary (default is no) ],
+#  AS_HELP_STRING([--with-simd], [create SIMD friendly binary (default is no) ]),
 #  [ SIMD=$withval ], [ SIMD="no" ])
 
 case "$target" in
@@ -344,7 +344,7 @@ AC_PATH_XTRA
 
 dnl Xft for trace window
 AC_ARG_ENABLE(xft,
-  [  --enable-xft         Enable use of Xft ])
+  AS_HELP_STRING([--enable-xft], [Enable use of Xft ]))
 
 AC_ARG_WITH(xawlib,
   [  --with-xawlib=lib     Try to link to these xaw widget libraries by the
@@ -793,26 +793,26 @@ fi
 
 dnl tcltk paths
 AC_ARG_WITH(tcl-includes,
-  [  --with-tcl-includes=DIR Tcl include file path ],
+  AS_HELP_STRING([--with-tcl-includes=DIR], [Tcl include file path]),
   [ if test ! -d $withval; then
       AC_MSG_WARN($withval is not found.)
     fi
     tcl_include_dir="-I$withval"
   ])
 AC_ARG_WITH(tcl-libs,
-  [  --with-tcl-libs=DIR     Tcl library file path ],
+  AS_HELP_STRING([--with-tcl-libs=DIR], [Tcl library file path]),
   [ if test ! -d $withval; then
       AC_MSG_WARN($withval is not found.)
     fi
     tcl_libdir="-L$withval" ])
 AC_ARG_WITH(tk-includes,
-  [  --with-tk-includes=DIR  Tk include file path ],
+  AS_HELP_STRING([--with-tk-includes=DIR], [Tk include file path]),
   [ if test ! -d $withval; then
       AC_MSG_WARN($withval is not found.)
     fi
     tk_includes="-I$withval" ])
 AC_ARG_WITH(tk-libs,
-  [  --with-tk-libs=DIR      Tk library file path ],
+  AS_HELP_STRING([--with-tk-libs=DIR], [Tk library file path]),
   [ if test ! -d $withval; then
       AC_MSG_WARN($withval is not found.)
     fi
@@ -820,13 +820,13 @@ AC_ARG_WITH(tk-libs,
 
 dnl offix paths
 AC_ARG_WITH(offix-includes,
-  [  --with-offix-includes=DIR Offix include file path ],
+  AS_HELP_STRING([--with-offix-includes=DIR], [Offix include file path]),
   [ if test ! -d $withval; then
       AC_MSG_WARN($withval is not found.)
     fi
     offix_include_dir="-I$withval" ])
 AC_ARG_WITH(offix-libs,
-  [  --with-offix-libs=DIR   Offix include file path ],
+  AS_HELP_STRING([--with-offix-libs=DIR], [Offix include file path]),
   [ if test ! -d $withval; then
       AC_MSG_WARN($withval is not found.)
     fi
@@ -863,9 +863,9 @@ dnl ao(O):      Libao
 audio_targets='default oss alsa sun hpux irix mme sb_dsp w32 alib nas arts esd vorbis flac gogo portaudio npipe jack ao'
 
 AC_ARG_WITH(nas-library,
-  [  --with-nas-library=library NAS absolute library path(Don't use -laudio)])
+  AS_HELP_STRING([--with-nas-library=library], [NAS absolute library path(Don't use -laudio)]))
 AC_ARG_WITH(nas-includes,
-  [  --with-nas-includes=DIR NAS include files are in dir])
+  AS_HELP_STRING([--with-nas-includes=DIR], [NAS include files are in dir]))
 
 
 AC_ARG_ENABLE(audio,
@@ -891,7 +891,8 @@ AC_ARG_ENABLE(audio,
                               vorbis:    Ogg Vorbis
                               flac:      FLAC / OggFLAC
                               speex:     Ogg Speex
-                              gogo:      MP3 GOGO (Only Windows is supported)],
+                              gogo:      MP3 GOGO (Only Windows is supported)
+],
   [ enable_audio=$enableval
     have_audio_opt=yes ],
   [ enable_audio=yes
@@ -909,15 +910,16 @@ fi
 dnl Turn on default output mode
 DEFAULT_PLAYMODE=
 AC_ARG_WITH(default-output,
-  [  --with-default-output=<mode>  Specify default output mode (optional):
+  AS_HELP_STRING([--with-default-output=<mode>],
+  [Specify default output mode (optional):
                                 (default|alsa|alib|arts|nas|
                                 esd|wav|au|aiff|list|vorbis|flac|speex|
-                                gogo|portaudio|npipe|jack|ao)],
+                                gogo|portaudio|npipe|jack|ao)]),
   [ if test "$enable_audio" != no; then
     DEFAULT_PLAYMODE=$withval
     eval "au_enable_$DEFAULT_PLAYMODE=yes"
   else
-    AC_MSG_WARN(--with-default-output=$withval: audio is not enabled)
+    AC_MSG_WARN([--with-default-output=$withval: audio is not enabled])
   fi])
 
 dnl compatibility matters.
@@ -1521,17 +1523,15 @@ AC_MSG_RESULT($DEFAULT_PLAYMODE/$TIMIDITY_OUTPUT_ID)
 interface_targets='dynamic ncurses slang motif tcltk emacs vt100 xaw xskin gtk alsaseq winsyn winsyng portmidisyng npsyn'
 
 AC_ARG_ENABLE(interface,
-  [  --enable-interface=[interface_list]
-                          Comma separated interface list ],
+  AS_HELP_STRING([--enable-interface=[interface_list]], [Comma separated interface list]),
   [ for i in `echo $enableval | sed 's/,/ /g'`; do
       eval "enable_$i=yes"
     done ])
 
 #  Dynamic link configuration
 AC_ARG_ENABLE(dynamic,
-  [  --enable-dynamic        Enable dynamic link interface   (default is no)
-  --enable-dynamic=dynamic_list
-                          Comma separated dynamic interface list],
+  AS_HELP_STRING([--enable-dynamic], [Enable dynamic link interface (default is no)])
+  AS_HELP_STRING([--enable-dynamic=dynamic_list] [Comma separated dynamic interface list]),
   [ dnl --enable-dynamic=yes to --enable-dynamic=dynamic
     if test "x$enable_dynamic" = xyes; then
       enable_dynamic=dynamic
@@ -1632,7 +1632,7 @@ AM_CONDITIONAL(NEEDDLOPEN, test "$NEEDDLOPEN" = "yes")
 
 dnl xdnd support
 AC_ARG_ENABLE(xdnd,
-  [  --enable-xdnd           Enable xdnd support             (default is no)],
+  AS_HELP_STRING([--enable-xdnd], [Enable xdnd support             (default is no)]),
   [ if test "$enableval" = "yes"; then
     AC_DEFINE(XDND,1,Define to 1 if you want xdnd support.)
     XDND_SRCS="xdnd.c"
@@ -1648,7 +1648,7 @@ dnl
 dnl ncurses
 AM_CONDITIONAL(ENABLE_NCURSES, false)
 CONFIG_INTERFACE(ncurses,NCURSES,n,
-  [  --enable-ncurses        Enable ncurses interface        (default is no)],
+  AS_HELP_STRING([--enable-ncurses], [Enable ncurses interface        (default is no)]),
   [ AC_CHECK_HEADERS(ncurses.h ncurses/curses.h curses.h)
 
 dnl #include <ncurses/curses.h> is failure on Plamo Linux 1.3/ncurses 1.9.9e
@@ -1722,7 +1722,7 @@ dnl configure must check ncurses header with -I/usr/include/ncurses option.
 dnl slang
 AM_CONDITIONAL(ENABLE_SLANG, false)
 CONFIG_INTERFACE(slang,SLANG,s,
-  [  --enable-slang          Enable slang interface          (default is no)],
+  AS_HELP_STRING([--enable-slang], [Enable slang interface          (default is no)]),
   [ AC_CHECK_LIB(slang,SLang_init_tty,:,
     [ enable_slang=no
       AC_MSG_WARN(slang interface is not enabled)
@@ -1752,7 +1752,7 @@ CONFIG_INTERFACE(slang,SLANG,s,
 dnl Motif
 AM_CONDITIONAL(ENABLE_MOTIF, false)
 CONFIG_INTERFACE(motif,MOTIF,m,
-  [  --enable-motif          Enable motif interface          (default is no)],
+  AS_HELP_STRING([--enable-motif], [Enable motif interface          (default is no)]),
   [ if test "x$with_x" != xyes; then
        AC_MSG_ERROR(motif: --with-x option must be specified)
     fi
@@ -1778,7 +1778,7 @@ CONFIG_INTERFACE(motif,MOTIF,m,
 dnl Tcl/Tk
 AM_CONDITIONAL(ENABLE_TCLTK, false)
 CONFIG_INTERFACE(tcltk,TCLTK,k,
-  [  --enable-tcltk          Enable tcltk interface          (default is no)],
+  AS_HELP_STRING([--enable-tcltk], [Enable tcltk interface          (default is no)]),
   [ if test "x$with_x" != xyes; then
        AC_MSG_ERROR(tcltk: --with-x option must be specified)
     fi
@@ -1833,7 +1833,7 @@ AM_CONDITIONAL(ENABLE_DYNAMIC_TCLTK, test "x$enable_tcltk" = "xdynamic")
 dnl Emacs
 AM_CONDITIONAL(ENABLE_EMACS, false)
 CONFIG_INTERFACE(emacs,EMACS,e,
-  [  --enable-emacs          Enable emacs interface          (default is no)],
+  AS_HELP_STRING([--enable-emacs], [Enable emacs interface          (default is no)]),
   ,
   [ ELFILES="$ELFILES timidity.el"
     INTERFACE_SRCS="$INTERFACE_SRCS emacs_c.c"
@@ -1844,14 +1844,14 @@ CONFIG_INTERFACE(emacs,EMACS,e,
 dnl VT100
 AM_CONDITIONAL(ENABLE_VT100, false)
 CONFIG_INTERFACE(vt100,VT100,T,
-  [  --enable-vt100          Enable VT100 interface          (default is no)],
+  AS_HELP_STRING([--enable-vt100], [Enable VT100 interface          (default is no)]),
   ,
   [ INTERFACE_SRCS="$INTERFACE_SRCS vt100_c.c vt100.c" ])
 
 dnl X Athena Widget
 AM_CONDITIONAL(ENABLE_XAW, false)
 CONFIG_INTERFACE(xaw,XAW,a,
-  [  --enable-xaw            Enable athena interface         (default is no)],
+  AS_HELP_STRING([--enable-xaw], [Enable athena interface         (default is no)]),
   [ if test "x$with_x" != xyes; then
        AC_MSG_ERROR(xaw: --with-x option must be specified)
     fi
@@ -1934,7 +1934,7 @@ AM_CONDITIONAL(ENABLE_DYNAMIC_XAW, test "x$enable_xaw" = "xdynamic")
 dnl X skin
 AM_CONDITIONAL(ENABLE_XSKIN, false)
 CONFIG_INTERFACE(xskin,XSKIN,i,
-  [  --enable-xskin          Enable X skin interface         (default is no)],
+  AS_HELP_STRING([--enable-xskin], [Enable X skin interface         (default is no)]),
   [ if test "x$with_x" != xyes; then
        AC_MSG_ERROR(xskin: --with-x option must be specified)
     fi
@@ -1945,7 +1945,7 @@ CONFIG_INTERFACE(xskin,XSKIN,i,
 dnl GTK+
 AM_CONDITIONAL(ENABLE_GTK, false)
 CONFIG_INTERFACE(gtk, GTK, g,
-  [  --enable-gtk            Enable GTK+ interface           (default is no)],
+  AS_HELP_STRING([--enable-gtk], [Enable GTK+ interface           (default is no)]),
   [ AM_PATH_GTK_2_0(2.0.0,
     [AC_DEFINE(HAVE_GTK_2,1,Define to 1 if you have GTK+ 2.x)],
     [AM_PATH_GTK(1.1.3,,enable_gtk=no)]) ],
@@ -1969,7 +1969,7 @@ CONFIG_INTERFACE(gtk, GTK, g,
 dnl TiMidity Network MIDI Server
 AM_CONDITIONAL(ENABLE_SERVER, false)
 CONFIG_INTERFACE(server,SERVER,r,
-  [  --enable-server         Enable server interface         (default is no)],
+  AS_HELP_STRING([--enable-server], [Enable server interface         (default is no)]),
   ,
   [ INTERFACE_SRCS="$INTERFACE_SRCS server_c.c"
     AC_CHECK_HEADERS(sys/soundcard.h)
@@ -1978,8 +1978,8 @@ CONFIG_INTERFACE(server,SERVER,r,
 dnl TiMidity ALSA sequencer server
 AM_CONDITIONAL(ENABLE_ALSASEQ, false)
 CONFIG_INTERFACE(alsaseq,ALSASEQ,A,
-  [  --enable-alsaseq        Enable ALSA sequencer server interface
-                                                          (default is no)],
+  AS_HELP_STRING([--enable-alsaseq], [Enable ALSA sequencer server interface
+                                                          (default is no)]),
   [ INTERFACE_SRCS="$INTERFACE_SRCS alsaseq_c.c"
   ],
   [ AM_PATH_ALSA
@@ -1990,24 +1990,24 @@ CONFIG_INTERFACE(alsaseq,ALSASEQ,A,
 dnl TiMidity Windows synthesizer server
 AM_CONDITIONAL(ENABLE_WINSYN, false)
 CONFIG_INTERFACE(winsyn,WINSYN,W,
-  [  --enable-winsyn        Enable Windows Synthesizer interface
-                                                          (default is no)],
+  AS_HELP_STRING([--enable-winsyn], [Enable Windows Synthesizer interface
+                                                          (default is no)]),
   ,
   [ WINSYN="yes"; INTERFACE_SRCS="$INTERFACE_SRCS winsyn_c.c rtsyn_common.c rtsyn_winmm.c" ])
 
 dnl TiMidity PortMIDI synthesizer server
 AM_CONDITIONAL(ENABLE_PORTMIDISYN, false)
 CONFIG_INTERFACE(portmidisyn,PORTMIDISYN,P,
-  [  --enable-portmidisyn        Enable PortMIDI Synthesizer interface
-                                                          (default is no)],
+  AS_HELP_STRING([--enable-portmidisyn], [Enable PortMIDI Synthesizer interface
+                                                          (default is no)]),
   ,
   [ INTERFACE_SRCS="$INTERFACE_SRCS portmidisyn_c.c rtsyn_common.c rtsyn_portmidi.c" ])
 
 dnl TiMidity Windows synthesizer server
 AM_CONDITIONAL(ENABLE_NPSYN, false)
 CONFIG_INTERFACE(npsyn,NPSYN,W,
-  [  --enable-npsyn        Enable Windows Named Pipe Synthesizer interface
-                                                          (default is no)],
+  AS_HELP_STRING([--enable-npsyn], [Enable Windows Named Pipe Synthesizer interface
+                                                          (default is no)]),
   ,
   [ NPSYN="yes"; INTERFACE_SRCS="$INTERFACE_SRCS npsyn_c.c rtsyn_common.c rtsyn_npipe.c" ])
 
@@ -2016,8 +2016,8 @@ CONFIG_INTERFACE(npsyn,NPSYN,W,
 dnl TiMidity Windows GUI synthesizer server
 AM_CONDITIONAL(ENABLE_W32G_SYN, false)
 CONFIG_INTERFACE(winsyng,W32G_SYN,W,
-  [  --enable-winsyng        Enable Windows GUI Synthesizer interface
-                                                          (default is no)],
+  AS_HELP_STRING([--enable-winsyng], [Enable Windows GUI Synthesizer interface
+                                                          (default is no)]),
   ,
   [ 
   W32G_GUI=yes
@@ -2056,7 +2056,7 @@ CONFIG_INTERFACE(winsyng,W32G_SYN,W,
 dnl Windows GUI
 AM_CONDITIONAL(ENABLE_W32GUI, false)
 CONFIG_INTERFACE(w32gui, W32GUI, w,
-  [  --enable-w32gui         Enable Windows GUI interface    (default is no)],
+  AS_HELP_STRING([--enable-w32gui], [Enable Windows GUI interface    (default is no)]),
   ,
   [
   W32G_GUI=yes 
@@ -2094,7 +2094,7 @@ CONFIG_INTERFACE(w32gui, W32GUI, w,
 dnl UMP configuration
 AM_CONDITIONAL(ENABLE_PLUGIN, false)
 CONFIG_INTERFACE(ump, PLUGIN, p,
-  [  --enable-ump            UMP configuration               (default is no)],
+  AS_HELP_STRING([--enable-ump], [UMP configuration               (default is no)]),
   [ if test ! -d ump; then
        AC_MSG_ERROR(UMP Package is not exists.  Can't configure it.)
     fi
@@ -2112,7 +2112,7 @@ CONFIG_INTERFACE(ump, PLUGIN, p,
 
 dnl Window Driver interface
 AC_ARG_ENABLE(windrv,
-  [  --enable-windrv         Windows Driver interface(requires winsyn) ],
+  AS_HELP_STRING([--enable-windrv], [Windows Driver interface(requires winsyn) ]),
   [ if test "$enableval" = "yes"; then
       if test "x$VCPP" != "xyes" && test "x$MINGWGCC" != "xyes" && test "x$BORLANDC" != "xyes" && test "x$WATCOM_C" != "xyes" && test "x$DMC" != "xyes" && test "x$POCC" != "xyes"; then
        AC_MSG_ERROR(windrv: Only Support VC++ or Mingw or Borland C or Open Watcom PellesC and Digital Mars)
@@ -2131,7 +2131,7 @@ CFLAGS="$CFLAGS $DLLFLAG "
 dnl Offix support
 dnl this rely on  CFLAGS and LIBS
 AC_ARG_ENABLE(offix,
-  [  --enable-offix          Enable offix support            (default is no)],
+  AS_HELP_STRING([--enable-offix], [Enable offix support            (default is no)]),
   [ if test "$enableval" = "yes"; then
       KEEPCPPFLAGS=$CPPFLAGS
       KEEPLIBS=$LIBS
@@ -2153,7 +2153,7 @@ AC_ARG_ENABLE(offix,
 
 dnl Network section
 AC_ARG_ENABLE(network,
-  [  --enable-network        Enable network support          (default is no)],
+  AS_HELP_STRING([--enable-network], [Enable network support          (default is no)]),
   [ if test "$enableval" = "yes"; then
       AC_DEFINE(SUPPORT_SOCKET,1,Define to 1 if you need network support)
     fi ])
@@ -2161,7 +2161,7 @@ AM_CONDITIONAL(ENABLE_NETWORK, test "x$enable_network" = "xyes")
 
 dnl Sound Spectrogram Viewer
 AC_ARG_ENABLE(spectrogram,
-  [  --enable-spectrogram    Enable Sound Spectrogram Viewer (default is no)],
+  AS_HELP_STRING([--enable-spectrogram], [Enable Sound Spectrogram Viewer (default is no)]),
   [ if test "$enableval" = "yes"; then
       if test "x$with_x" != xyes; then
        AC_MSG_ERROR(spectrogram: --with-x option must be specified)
@@ -2172,9 +2172,8 @@ AM_CONDITIONAL(ENABLE_SOUND_SPEC, test "x$enable_spectrogram" = "xyes")
 
 dnl Wave Spline Interpolations
 AC_ARG_ENABLE(spline,
-  [  --enable-spline=[method]  Specify spline method.
-                                  one of no,linear,cubic,lagrange,newton,gauss
-                                                          (default is linear)],
+  AS_HELP_STRING([--enable-spline=[method]],
+    [Specify spline method.  one of no,linear,cubic,lagrange,newton,gauss (default is linear)]),
   [ case "x$enableval" in
       xlinear)
         AC_DEFINE(DEFAULT_RESAMPLATION,resample_linear,Define resampler.)
@@ -2201,7 +2200,7 @@ AC_ARG_ENABLE(spline,
 
 dnl WRD interface
 AC_ARG_ENABLE(wrd,
-  [  --enable-wrd            Enable WRD interface for X      (default is no)],
+  AS_HELP_STRING([--enable-wrd], [Enable WRD interface for X      (default is no)]),
   [ if test "$enableval" = "yes"; then
       if test "x$with_x" = xyes; then
         LIBS="-lX11 $LIBS"