use AS_HELP_STRING for all configure options

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/configure b/configure
index 6884892..2dcbc48 100755 (executable)
--- a/configure
+++ b/configure
@@ -1360,8 +1360,8 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-ld-elf2flt-binary
                           use ld-elf2flt shell script
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-ld-elf2flt-binary
                           use ld-elf2flt shell script

- --disable-got-check - disable check for GOT (needed on H8)
- --disable-emit-relocs - don't use the --emit-relocs (-q) linker option
+  --disable-got-check     disable check for GOT (needed on H8)
+  --disable-emit-relocs   don't use the --emit-relocs (-q) linker option

   --enable-emit-ctor-dtor manually create ctor/dtor list
   --enable-always-reloc-text
                           always process text relocs ignoring pic/got (needed
   --enable-emit-ctor-dtor manually create ctor/dtor list
   --enable-always-reloc-text
                           always process text relocs ignoring pic/got (needed


@@ -1370,13 +1370,18 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)

- --with-zlib-prefix=<dir>  path to installed zlib
- --with-libbfd=<file>  path to libbfd.a library to use
- --with-libiberty=<file>  path to libiberty.a library to use
- --with-bfd-include-dir=<dir>  include path for correct bfd.h
- --with-binutils-include-dir=<dir>  include path for binutils headers
- --with-binutils-ldscript-dir=<dir>  path to install elf2flt.ld
- --with-binutils-build-dir=<dir>  path to compiled binutils tree
+  --with-zlib-prefix=<dir>
+                          path to installed zlib
+  --with-libbfd=<file>    path to libbfd.a library to use
+  --with-libiberty=<file> path to libiberty.a library to use
+  --with-bfd-include-dir=<dir>
+                          include path for correct bfd.h
+  --with-binutils-include-dir=<dir>
+                          include path for binutils headers
+  --with-binutils-ldscript-dir=<dir>
+                          path to install elf2flt.ld
+  --with-binutils-build-dir=<dir>
+                          path to compiled binutils tree

 
 Some influential environment variables:
   CC          C compiler command
 
 Some influential environment variables:
   CC          C compiler command

diff --git a/configure.in b/configure.in
index 6003d8c..951eb32 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,43 +2,43 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(elf2flt.c)
 
 AC_ARG_WITH(zlib-prefix,
 AC_INIT(elf2flt.c)
 
 AC_ARG_WITH(zlib-prefix,

-       [ --with-zlib-prefix=<dir>  path to installed zlib ],
+       AS_HELP_STRING([--with-zlib-prefix=<dir>], [path to installed zlib]),

        [ ac_zlib_prefix=$withval ],
        [ ac_zlib_prefix=NONE ]
 )
 
 AC_ARG_WITH(libbfd,
        [ ac_zlib_prefix=$withval ],
        [ ac_zlib_prefix=NONE ]
 )
 
 AC_ARG_WITH(libbfd,

-       [ --with-libbfd=<file>  path to libbfd.a library to use ],
+       AS_HELP_STRING([--with-libbfd=<file>], [path to libbfd.a library to use]),

        [ ac_libbfd=$withval ],
        [ ac_libbfd=NONE ]
 )
 
 AC_ARG_WITH(libiberty,
        [ ac_libbfd=$withval ],
        [ ac_libbfd=NONE ]
 )
 
 AC_ARG_WITH(libiberty,

-       [ --with-libiberty=<file>  path to libiberty.a library to use ],
+       AS_HELP_STRING([--with-libiberty=<file>], [path to libiberty.a library to use]),

        [ ac_libiberty=$withval ],
        [ ac_libiberty=NONE ]
 )
 
 AC_ARG_WITH(bfd-include-dir,
        [ ac_libiberty=$withval ],
        [ ac_libiberty=NONE ]
 )
 
 AC_ARG_WITH(bfd-include-dir,

-       [ --with-bfd-include-dir=<dir>  include path for correct bfd.h ],
+       AS_HELP_STRING([--with-bfd-include-dir=<dir>], [include path for correct bfd.h]),

        [ ac_bfd_include_dir=$withval ],
        [ ac_bfd_include_dir=NONE ]
 )
 
 AC_ARG_WITH(binutils-include-dir,
        [ ac_bfd_include_dir=$withval ],
        [ ac_bfd_include_dir=NONE ]
 )
 
 AC_ARG_WITH(binutils-include-dir,

-       [ --with-binutils-include-dir=<dir>  include path for binutils headers ],
+       AS_HELP_STRING([--with-binutils-include-dir=<dir>], [include path for binutils headers]),

        [ ac_binutils_include_dir=$withval ],
        [ ac_binutils_include_dir=NONE ]
 )
 
 AC_ARG_WITH(binutils-ldscript-dir,
        [ ac_binutils_include_dir=$withval ],
        [ ac_binutils_include_dir=NONE ]
 )
 
 AC_ARG_WITH(binutils-ldscript-dir,

-       [ --with-binutils-ldscript-dir=<dir>  path to install elf2flt.ld ],
+       AS_HELP_STRING([--with-binutils-ldscript-dir=<dir>], [path to install elf2flt.ld]),

        [ ac_binutils_ldscript_dir=$withval ],
        [ ac_binutils_ldscript_dir=NONE ]
 )
 
 AC_ARG_WITH(binutils-build-dir,
        [ ac_binutils_ldscript_dir=$withval ],
        [ ac_binutils_ldscript_dir=NONE ]
 )
 
 AC_ARG_WITH(binutils-build-dir,

-       [ --with-binutils-build-dir=<dir>  path to compiled binutils tree ],
+       AS_HELP_STRING([--with-binutils-build-dir=<dir>], [path to compiled binutils tree]),

        [ ac_binutils_build_dir=$withval ],
        [ ac_binutils_build_dir=NONE ]
 )
        [ ac_binutils_build_dir=$withval ],
        [ ac_binutils_build_dir=NONE ]
 )


@@ -59,14 +59,14 @@ var_yn_to_10() {
 }
 
 AC_ARG_ENABLE(got-check,
 }
 
 AC_ARG_ENABLE(got-check,

-       [ --disable-got-check - disable check for GOT (needed on H8) ],
+       AS_HELP_STRING([--disable-got-check], [disable check for GOT (needed on H8)]),

        [ got_check=$enableval ],
        [ got_check=yes ]
 )
 var_yn_to_10 got_check
 
 AC_ARG_ENABLE(emit-relocs,
        [ got_check=$enableval ],
        [ got_check=yes ]
 )
 var_yn_to_10 got_check
 
 AC_ARG_ENABLE(emit-relocs,

-       [ --disable-emit-relocs - don't use the --emit-relocs (-q) linker option ],
+       AS_HELP_STRING([--disable-emit-relocs], [don't use the --emit-relocs (-q) linker option]),

        [ emit_relocs=$enableval ],
        [ emit_relocs=yes ]
 )
        [ emit_relocs=$enableval ],
        [ emit_relocs=yes ]
 )