This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
| Other format: | [Raw text] | |
Ping. I don't have write access.
**Updated patch attached**, modified so the commits during the past
two months don't cause conflicts. Minor other updating (i.e. Likewise
rather than repeating in ChangeLogs.)
GCC **updated patch also ATTACHED** from May 24, also modified so its
commits during past two months don't conflict.
On Sun, May 24, 2015 at 3:56 PM, Michael Darling <darlingm@gmail.com> wrote:
> Completes renaming of configure.in files to configure.ac. Combined
> builds has been broken for about 10 months, because some binutils
> configure.in files were renamed to configure.ac, but gcc's references to
> them were not updated. Fixing gcc's references to them is much easier
> by renaming the few straggling configure.in files to configure.ac.
> gcc's configure.in files were entirely renamed to confiugre.ac some time
> ago. There is a corresponding patch submitted to gcc, which updates all
> references to binutils-gdb configure.in files to configure.ac, which is
> what ultimately fixes the combined builds.
>
> See PR binutils-gdb/binutils/18450 and gcc/other/66259.
>
> Signed-off by: Michael Darling <darlingm@gmail.com>
>
> ---
> ChangeLog | 7 +
> bfd/ChangeLog | 5 +
> bfd/configure | 2 +-
> binutils/ChangeLog | 6 +
> binutils/MAINTAINERS | 2 +-
> binutils/configure | 2 +-
> config/ChangeLog | 8 +
> config/gettext.m4 | 4 +-
> config/po.m4 | 2 +-
> config/stdint.m4 | 2 +-
> config/tcl.m4 | 2 +-
> configure | 6 +-
> configure.ac | 8 +-
> etc/ChangeLog | 5 +
> etc/Makefile.in | 2 +-
> etc/configure.ac | 27 +++
> etc/configure.in | 27 ---
> gas/ChangeLog | 5 +
> gas/configure | 2 +-
> gdb/ChangeLog | 7 +
> gdb/acinclude.m4 | 2 +-
> gdb/config/djgpp/fnchange.lst | 2 +-
> gdb/configure | 2 +-
> gdb/gdbserver/ChangeLog | 5 +
> gdb/gdbserver/acinclude.m4 | 2 +-
> gdb/testsuite/ChangeLog | 5 +
> gdb/testsuite/configure | 2 +-
> gold/ChangeLog | 5 +
> gold/configure | 4 +-
> gprof/ChangeLog | 5 +
> gprof/configure | 4 +-
> intl/ChangeLog | 5 +
> intl/configure | 4 +-
> ld/ChangeLog | 5 +
> ld/configure | 4 +-
> opcodes/ChangeLog | 5 +
> opcodes/configure | 4 +-
> readline/ChangeLog.gdb | 8 +
> readline/INSTALL | 6 +-
> readline/MANIFEST | 4 +-
> readline/aclocal.m4 | 12 +-
> readline/configure.ac | 304 +++++++++++++++++++++++++
> readline/configure.in | 304 -------------------------
> readline/examples/rlfe/ChangeLog | 6 +
> readline/examples/rlfe/Makefile.in | 4 +-
> readline/examples/rlfe/configure.ac | 442 ++++++++++++++++++++++++++++++++++++
> readline/examples/rlfe/configure.in | 442 ------------------------------------
> sim/ChangeLog | 6 +
> sim/README-HACKING | 4 +-
> sim/common/ChangeLog | 6 +
> sim/common/acinclude.m4 | 6 +-
> sim/common/sim-config.h | 2 +-
> sim/configure | 2 +-
> sim/mips/ChangeLog | 6 +
> sim/mips/configure | 8 +-
> sim/mips/configure.ac | 6 +-
> sim/testsuite/ChangeLog | 5 +
> sim/testsuite/configure | 2 +-
> src-release.sh | 2 +-
> 59 files changed, 949 insertions(+), 834 deletions(-)
> create mode 100644 etc/configure.ac
> delete mode 100644 etc/configure.in
> create mode 100644 readline/configure.ac
> delete mode 100644 readline/configure.in
> create mode 100644 readline/examples/rlfe/configure.ac
> delete mode 100644 readline/examples/rlfe/configure.in
>
> diff --git a/ChangeLog b/ChangeLog
> index 583b822..c2aa03b 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,10 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * configure: Reflects renaming of configure.in to configure.ac
> + * configure.ac: Reflects renaming of configure.in to configure.ac
> + * src-release.sh: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-13 John David Anglin <dave.anglin@bell.net>
>
> * configure.ac: Disable configuration of GDB for HPUX targets.
> diff --git a/bfd/ChangeLog b/bfd/ChangeLog
> index 87a0bff..37f9332 100644
> --- a/bfd/ChangeLog
> +++ b/bfd/ChangeLog
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-26 H.J. Lu <hongjiu.lu@intel.com>
>
> PR binutils/18437
> diff --git a/bfd/configure b/bfd/configure
> index eeeb89a..9ce3fc1 100755
> --- a/bfd/configure
> +++ b/bfd/configure
> @@ -18338,7 +18338,7 @@ _LT_EOF
> if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> # The LINGUAS file contains the set of available languages.
> if test -n "$OBSOLETE_ALL_LINGUAS"; then
> - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.in is obsolete" || echo "setting ALL_LINGUAS in
> configure.in is obsolete"
> + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.ac is obsolete" || echo "setting ALL_LINGUAS in
> configure.ac is obsolete"
> fi
> ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> # Hide the ALL_LINGUAS assigment from automake.
> diff --git a/binutils/ChangeLog b/binutils/ChangeLog
> index 6bb1f1a..835250f 100644
> --- a/binutils/ChangeLog
> +++ b/binutils/ChangeLog
> @@ -1,3 +1,9 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * MAINTAINERS: Reflects renaming of configure.in to configure.ac
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-18 Nick Clifton <nickc@redhat.com>
>
> PR binutils/18420
> diff --git a/binutils/MAINTAINERS b/binutils/MAINTAINERS
> index 37f4601..74882dd 100644
> --- a/binutils/MAINTAINERS
> +++ b/binutils/MAINTAINERS
> @@ -22,7 +22,7 @@ top level config.guess and config.sub scripts should
> be sent to:
> config-patches@gnu.org
>
> and not to the binutils lists. Patches to the other top level
> -configure files (configure, configure.in, config-ml.in) should
> +configure files (configure, configure.ac, config-ml.in) should
> be sent to the binutils lists, and copied to the gcc and gdb
> lists as well (gcc-patches@gcc.gnu.org and
> gdb-patches@sourceware.org).
> diff --git a/binutils/configure b/binutils/configure
> index 5db82d7..38c4467 100755
> --- a/binutils/configure
> +++ b/binutils/configure
> @@ -16908,7 +16908,7 @@ _LT_EOF
> if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> # The LINGUAS file contains the set of available languages.
> if test -n "$OBSOLETE_ALL_LINGUAS"; then
> - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.in is obsolete" || echo "setting ALL_LINGUAS in
> configure.in is obsolete"
> + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.ac is obsolete" || echo "setting ALL_LINGUAS in
> configure.ac is obsolete"
> fi
> ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> # Hide the ALL_LINGUAS assigment from automake.
> diff --git a/config/ChangeLog b/config/ChangeLog
> index 6ffb0ed..b64cbf1 100644
> --- a/config/ChangeLog
> +++ b/config/ChangeLog
> @@ -1,3 +1,11 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * gettext.m4: Reflects renaming of configure.in to configure.ac
> + * po.m4: Reflects renaming of configure.in to configure.ac
> + * stdint.m4: Reflects renaming of configure.in to configure.ac
> + * tc1.m4: Reflects renaming of configure.in to configure.ac
> +
> 2015-04-02 H.J. Lu <hongjiu.lu@intel.com>
>
> * zlib.m4 (AM_ZLIB): Set zlibdir to -L\$(top_builddir)/../zlib
> diff --git a/config/gettext.m4 b/config/gettext.m4
> index 16070b4..45fa6b4 100644
> --- a/config/gettext.m4
> +++ b/config/gettext.m4
> @@ -81,7 +81,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
> dnl Ideally we would do this search only after the
> dnl if test "$USE_NLS" = "yes"; then
> dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
> - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
> + dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT
> dnl the configure script would need to contain the same shell code
> dnl again, outside any 'if'. There are two solutions:
> dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
> @@ -303,7 +303,7 @@ return (int) gettext ("")]ifelse([$2],
> [need-ngettext], [ + (int) ngettext ("",
> AC_SUBST(USE_INCLUDED_LIBINTL)
> AC_SUBST(CATOBJEXT)
>
> - dnl For backward compatibility. Some configure.ins may be using this.
> + dnl For backward compatibility. Some configure.acs may be using this.
> nls_cv_header_intl=
> nls_cv_header_libgt=
>
> diff --git a/config/po.m4 b/config/po.m4
> index 2edd5a7..f0f25e9 100644
> --- a/config/po.m4
> +++ b/config/po.m4
> @@ -117,7 +117,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
> if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> # The LINGUAS file contains the set of available languages.
> if test -n "$OBSOLETE_ALL_LINGUAS"; then
> - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.in is obsolete" || echo "setting ALL_LINGUAS in
> configure.in is obsolete"
> + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.ac is obsolete" || echo "setting ALL_LINGUAS in
> configure.ac is obsolete"
> fi
> ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> # Hide the ALL_LINGUAS assigment from automake.
> diff --git a/config/stdint.m4 b/config/stdint.m4
> index 61898a7..59f4359 100644
> --- a/config/stdint.m4
> +++ b/config/stdint.m4
> @@ -39,7 +39,7 @@ dnl If your installed header files require the
> stdint-types you will want to
> dnl create an installable file mylib-int.h that all your other installable
> dnl header may include. So, for a library package named "mylib", just use
> dnl GCC_HEADER_STDINT(mylib-int.h)
> -dnl in configure.in and install that header file in Makefile.am along with
> +dnl in configure.ac and install that header file in Makefile.am along with
> dnl the other headers (mylib.h). The mylib-specific headers can simply
> dnl use "#include <mylib-int.h>" to obtain the stdint-types.
> dnl
> diff --git a/config/tcl.m4 b/config/tcl.m4
> index 59a0c7e..8fa94a2 100644
> --- a/config/tcl.m4
> +++ b/config/tcl.m4
> @@ -2136,7 +2136,7 @@ dnl # preprocessing tests use only CPPFLAGS.
> INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE)
> $(LIB_INSTALL_DIR)/$(LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB)
> $(LIB_FILE))'
> fi
>
> -dnl Not at all clear what this was doing in Tcl's configure.in
> +dnl Not at all clear what this was doing in Tcl's configure.ac
> dnl or why it was needed was needed. In any event, this sort of
> dnl things needs to be done in the big loop above.
> dnl REMOVE THIS BLOCK LATER! (mdejong)
> diff --git a/configure b/configure
> index a2e253a..909bb53 100755
> --- a/configure
> +++ b/configure
> @@ -6164,7 +6164,7 @@ if test -d ${srcdir}/gcc; then
> if test x"${enable_languages+set}" != xset; then
> if test x"${LANGUAGES+set}" = xset; then
> enable_languages="${LANGUAGES}"
> - echo configure.in: warning: setting LANGUAGES is deprecated,
> use --enable-languages instead 1>&2
> + echo configure.ac: warning: setting LANGUAGES is deprecated,
> use --enable-languages instead 1>&2
> else
> enable_languages=all
> fi
> @@ -6172,7 +6172,7 @@ if test -d ${srcdir}/gcc; then
> if test x"${enable_languages}" = x ||
> test x"${enable_languages}" = xyes;
> then
> - echo configure.in: --enable-languages needs at least one
> language argument 1>&2
> + echo configure.ac: --enable-languages needs at least one
> language argument 1>&2
> exit 1
> fi
> fi
> @@ -6182,7 +6182,7 @@ if test -d ${srcdir}/gcc; then
> # and make the substitution.
> case ,${enable_languages}, in
> *,f95,*)
> - echo configure.in: warning: 'f95' as language name is
> deprecated, use 'fortran' instead 1>&2
> + echo configure.ac: warning: 'f95' as language name is
> deprecated, use 'fortran' instead 1>&2
> enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
> ;;
> esac
> diff --git a/configure.ac b/configure.ac
> index 8132df0..431fe30 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1854,7 +1854,7 @@ if test -d ${srcdir}/gcc; then
> if test x"${enable_languages+set}" != xset; then
> if test x"${LANGUAGES+set}" = xset; then
> enable_languages="${LANGUAGES}"
> - echo configure.in: warning: setting LANGUAGES is deprecated,
> use --enable-languages instead 1>&2
> + echo configure.ac: warning: setting LANGUAGES is deprecated,
> use --enable-languages instead 1>&2
> else
> enable_languages=all
> fi
> @@ -1862,7 +1862,7 @@ if test -d ${srcdir}/gcc; then
> if test x"${enable_languages}" = x ||
> test x"${enable_languages}" = xyes;
> then
> - echo configure.in: --enable-languages needs at least one
> language argument 1>&2
> + echo configure.ac: --enable-languages needs at least one
> language argument 1>&2
> exit 1
> fi
> fi
> @@ -1872,7 +1872,7 @@ if test -d ${srcdir}/gcc; then
> # and make the substitution.
> case ,${enable_languages}, in
> *,f95,*)
> - echo configure.in: warning: 'f95' as language name is
> deprecated, use 'fortran' instead 1>&2
> + echo configure.ac: warning: 'f95' as language name is
> deprecated, use 'fortran' instead 1>&2
> enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
> ;;
> esac
> @@ -2443,7 +2443,7 @@ fi
> # have requested that this magic not happen.
> #
> # The command line options always override the explicit settings in
> -# configure.in, and the settings in configure.in override this magic.
> +# configure.ac, and the settings in configure.ac override this magic.
> #
> # If the default for a toolchain is to use GNU as and ld, and you don't
> # want to do that, then you should use the --without-gnu-as and
> diff --git a/etc/ChangeLog b/etc/ChangeLog
> index 516e6a9..f5ff827 100644
> --- a/etc/ChangeLog
> +++ b/etc/ChangeLog
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + * configure.ac: Renamed from configure.in
> + * Makefile.in: Reflects renaming of configure.in to configure.ac
> +
> 2014-06-27 Ludovic CourtÃs <ludo@gnu.org>
>
> PR external/16327
> diff --git a/etc/Makefile.in b/etc/Makefile.in
> index 4aa64c1..eabd28c 100644
> --- a/etc/Makefile.in
> +++ b/etc/Makefile.in
> @@ -56,7 +56,7 @@ Makefile: $(srcdir)/Makefile.in
> $(host_makefile_frag) $(target_makefile_frag) \
> $(SHELL) ./config.status
>
> AUTOCONF = autoconf
> -configure_deps = $(srcdir)/configure.in
> +configure_deps = $(srcdir)/configure.ac
>
> $(srcdir)/configure: @MAINT@ $(configure_deps)
> cd $(srcdir) && $(AUTOCONF)
> diff --git a/etc/configure.ac b/etc/configure.ac
> new file mode 100644
> index 0000000..6b94aac
> --- /dev/null
> +++ b/etc/configure.ac
> @@ -0,0 +1,27 @@
> +dnl Process this file with autoconf to produce a configure script.
> +AC_PREREQ(2.5)
> +AC_INIT(Makefile.in)
> +
> +AC_PROG_INSTALL
> +
> +# Command-line options.
> +# Very limited version of AC_MAINTAINER_MODE.
> +AC_ARG_ENABLE([maintainer-mode],
> + [AC_HELP_STRING([--enable-maintainer-mode],
> + [enable make rules and dependencies not useful (and
> + sometimes confusing) to the casual installer])],
> + [case ${enable_maintainer_mode} in
> + yes) MAINT='' ;;
> + no) MAINT='#' ;;
> + *) AC_MSG_ERROR([--enable-maintainer-mode must be yes or no]) ;;
> + esac
> + maintainer_mode=${enableval}],
> + [MAINT='#'])
> +AC_SUBST([MAINT])dnl
> +
> +AC_SUBST(datarootdir)
> +AC_SUBST(docdir)
> +AC_SUBST(htmldir)
> +AC_SUBST(pdfdir)
> +
> +AC_OUTPUT(Makefile)
> diff --git a/etc/configure.in b/etc/configure.in
> deleted file mode 100644
> index 6b94aac..0000000
> --- a/etc/configure.in
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -dnl Process this file with autoconf to produce a configure script.
> -AC_PREREQ(2.5)
> -AC_INIT(Makefile.in)
> -
> -AC_PROG_INSTALL
> -
> -# Command-line options.
> -# Very limited version of AC_MAINTAINER_MODE.
> -AC_ARG_ENABLE([maintainer-mode],
> - [AC_HELP_STRING([--enable-maintainer-mode],
> - [enable make rules and dependencies not useful (and
> - sometimes confusing) to the casual installer])],
> - [case ${enable_maintainer_mode} in
> - yes) MAINT='' ;;
> - no) MAINT='#' ;;
> - *) AC_MSG_ERROR([--enable-maintainer-mode must be yes or no]) ;;
> - esac
> - maintainer_mode=${enableval}],
> - [MAINT='#'])
> -AC_SUBST([MAINT])dnl
> -
> -AC_SUBST(datarootdir)
> -AC_SUBST(docdir)
> -AC_SUBST(htmldir)
> -AC_SUBST(pdfdir)
> -
> -AC_OUTPUT(Makefile)
> diff --git a/gas/ChangeLog b/gas/ChangeLog
> index f3a30d2..aadd723 100644
> --- a/gas/ChangeLog
> +++ b/gas/ChangeLog
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-22 Nick Clifton <nickc@redhat.com>
>
> PR gas/18446
> diff --git a/gas/configure b/gas/configure
> index cb33d03..21faa93 100755
> --- a/gas/configure
> +++ b/gas/configure
> @@ -16811,7 +16811,7 @@ _LT_EOF
> if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> # The LINGUAS file contains the set of available languages.
> if test -n "$OBSOLETE_ALL_LINGUAS"; then
> - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.in is obsolete" || echo "setting ALL_LINGUAS in
> configure.in is obsolete"
> + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.ac is obsolete" || echo "setting ALL_LINGUAS in
> configure.ac is obsolete"
> fi
> ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> # Hide the ALL_LINGUAS assigment from automake.
> diff --git a/gdb/ChangeLog b/gdb/ChangeLog
> index f55b9c4..58efb1f 100644
> --- a/gdb/ChangeLog
> +++ b/gdb/ChangeLog
> @@ -1,3 +1,10 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * acinclude.m4: Reflects renaming of configure.in to configure.ac
> + * configure: Reflects renaming of configure.in to configure.ac
> + * config/djgpp/fnchange.lst: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-22 Andrew Burgess <andrew.burgess@embecosm.com>
>
> * NEWS: Mention 'tui enable' and 'tui disable'.
> diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
> index 845e65f..fee11ff 100644
> --- a/gdb/acinclude.m4
> +++ b/gdb/acinclude.m4
> @@ -12,7 +12,7 @@ sinclude(libmcheck.m4)
> # This gets GDB_AC_TRANSFORM.
> sinclude(transform.m4)
>
> -dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition.
> +dnl gdb/configure.ac uses BFD_NEED_DECLARATION, so get its definition.
> sinclude(../bfd/bfd.m4)
>
> dnl This gets the standard macros.
> diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst
> index c05eb2c..e7a6a23 100644
> --- a/gdb/config/djgpp/fnchange.lst
> +++ b/gdb/config/djgpp/fnchange.lst
> @@ -470,7 +470,7 @@
> @V@/gdb/testsuite/gdb.gdbtk/c_variable.exp
> @V@/gdb/testsuite/gdb.tk/c_variable.exp
> @V@/gdb/testsuite/gdb.gdbtk/c_variable.test
> @V@/gdb/testsuite/gdb.tk/c_variable.test
> @V@/gdb/testsuite/gdb.gdbtk/configure @V@/gdb/testsuite/gdb.tk/configure
> -@V@/gdb/testsuite/gdb.gdbtk/configure.in @V@/gdb/testsuite/gdb.tk/configure.in
> +@V@/gdb/testsuite/gdb.gdbtk/configure.ac @V@/gdb/testsuite/gdb.tk/configure.ac
> @V@/gdb/testsuite/gdb.gdbtk/console.exp @V@/gdb/testsuite/gdb.tk/console.exp
> @V@/gdb/testsuite/gdb.gdbtk/console.test @V@/gdb/testsuite/gdb.tk/console.test
> @V@/gdb/testsuite/gdb.gdbtk/cpp_variable.cc
> @V@/gdb/testsuite/gdb.tk/cpp_variable.cc
> diff --git a/gdb/configure b/gdb/configure
> index 2baf6dd..c3a7cb2 100755
> --- a/gdb/configure
> +++ b/gdb/configure
> @@ -17104,7 +17104,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
> ac_sub_configure=$ac_srcdir/configure.gnu
> elif test -f "$ac_srcdir/configure"; then
> ac_sub_configure=$ac_srcdir/configure
> - elif test -f "$ac_srcdir/configure.in"; then
> + elif test -f "$ac_srcdir/configure.ac"; then
> # This should be Cygnus configure.
> ac_sub_configure=$ac_aux_dir/configure
> else
> diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
> index 0f30c66..53a12fb 100644
> --- a/gdb/gdbserver/ChangeLog
> +++ b/gdb/gdbserver/ChangeLog
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * acinclude.m4: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-15 Pedro Alves <palves@redhat.com>
>
> * target.h (target_handle_new_gdb_connection): Rewrite using if
> diff --git a/gdb/gdbserver/acinclude.m4 b/gdb/gdbserver/acinclude.m4
> index 0b86c04..ca1aebf 100644
> --- a/gdb/gdbserver/acinclude.m4
> +++ b/gdb/gdbserver/acinclude.m4
> @@ -1,4 +1,4 @@
> -dnl gdb/gdbserver/configure.in uses BFD_HAVE_SYS_PROCFS_TYPE.
> +dnl gdb/gdbserver/configure.ac uses BFD_HAVE_SYS_PROCFS_TYPE.
> sinclude(../../bfd/bfd.m4)
>
> sinclude(../acx_configure_dir.m4)
> diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
> index b8f514b..ccb7b33 100644
> --- a/gdb/testsuite/ChangeLog
> +++ b/gdb/testsuite/ChangeLog
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-22 Patrick Palka <patrick@parcs.ath.cx>
>
> * gdb.base/gdbinit-history.exp (test_gdbinit_history_setting):
> diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure
> index 0853e48..967b009 100755
> --- a/gdb/testsuite/configure
> +++ b/gdb/testsuite/configure
> @@ -4802,7 +4802,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
> ac_sub_configure=$ac_srcdir/configure.gnu
> elif test -f "$ac_srcdir/configure"; then
> ac_sub_configure=$ac_srcdir/configure
> - elif test -f "$ac_srcdir/configure.in"; then
> + elif test -f "$ac_srcdir/configure.ac"; then
> # This should be Cygnus configure.
> ac_sub_configure=$ac_aux_dir/configure
> else
> diff --git a/gold/ChangeLog b/gold/ChangeLog
> index 64ce33f..8b5514c 100644
> --- a/gold/ChangeLog
> +++ b/gold/ChangeLog
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-16 Alan Modra <amodra@gmail.com>
>
> * reloc.cc (Sized_relobj_file::find_functions): Use function_location.
> diff --git a/gold/configure b/gold/configure
> index a005a75..eac9669 100755
> --- a/gold/configure
> +++ b/gold/configure
> @@ -9164,14 +9164,14 @@ $as_echo X"$file" |
> if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> # The LINGUAS file contains the set of available languages.
> if test -n "$OBSOLETE_ALL_LINGUAS"; then
> - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.in is obsolete" || echo "setting ALL_LINGUAS in
> configure.in is obsolete"
> + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.ac is obsolete" || echo "setting ALL_LINGUAS in
> configure.ac is obsolete"
> fi
> ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> # Hide the ALL_LINGUAS assigment from automake.
> eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
> POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
> else
> - # The set of available languages was given in configure.in.
> + # The set of available languages was given in configure.ac.
> eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
> fi
> case "$ac_given_srcdir" in
> diff --git a/gprof/ChangeLog b/gprof/ChangeLog
> index 7a2087b..2817f8e 100644
> --- a/gprof/ChangeLog
> +++ b/gprof/ChangeLog
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-04-29 Nick Clifton <nickc@redhat.com>
>
> * po/da.po: Update Danish translation.
> diff --git a/gprof/configure b/gprof/configure
> index 80c9aaf..cdd2e3a 100755
> --- a/gprof/configure
> +++ b/gprof/configure
> @@ -14513,14 +14513,14 @@ _LT_EOF
> if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> # The LINGUAS file contains the set of available languages.
> if test -n "$OBSOLETE_ALL_LINGUAS"; then
> - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.in is obsolete" || echo "setting ALL_LINGUAS in
> configure.in is obsolete"
> + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.ac is obsolete" || echo "setting ALL_LINGUAS in
> configure.ac is obsolete"
> fi
> ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> # Hide the ALL_LINGUAS assigment from automake.
> eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
> POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
> else
> - # The set of available languages was given in configure.in.
> + # The set of available languages was given in configure.ac.
> eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
> fi
> case "$ac_given_srcdir" in
> diff --git a/intl/ChangeLog b/intl/ChangeLog
> index ea012cd..08d99d7 100644
> --- a/intl/ChangeLog
> +++ b/intl/ChangeLog
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2010-06-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
>
> PR bootstrap/44621
> diff --git a/intl/configure b/intl/configure
> index 34da38b..f58226d 100755
> --- a/intl/configure
> +++ b/intl/configure
> @@ -7851,14 +7851,14 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
> if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> # The LINGUAS file contains the set of available languages.
> if test -n "$OBSOLETE_ALL_LINGUAS"; then
> - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.in is obsolete" || echo "setting ALL_LINGUAS in
> configure.in is obsolete"
> + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.ac is obsolete" || echo "setting ALL_LINGUAS in
> configure.ac is obsolete"
> fi
> ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> # Hide the ALL_LINGUAS assigment from automake.
> eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
> POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
> else
> - # The set of available languages was given in configure.in.
> + # The set of available languages was given in configure.ac.
> eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
> fi
> case "$ac_given_srcdir" in
> diff --git a/ld/ChangeLog b/ld/ChangeLog
> index 433bdd3..f84d1e0 100644
> --- a/ld/ChangeLog
> +++ b/ld/ChangeLog
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-17 Chung-Lin Tang <cltang@codesourcery.com>
>
> * configure.ac (AC_PROG_GREP): Check for grep program.
> diff --git a/ld/configure b/ld/configure
> index 8b3dd7b..1249852 100755
> --- a/ld/configure
> +++ b/ld/configure
> @@ -19835,14 +19835,14 @@ _LT_EOF
> if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> # The LINGUAS file contains the set of available languages.
> if test -n "$OBSOLETE_ALL_LINGUAS"; then
> - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.in is obsolete" || echo "setting ALL_LINGUAS in
> configure.in is obsolete"
> + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.ac is obsolete" || echo "setting ALL_LINGUAS in
> configure.ac is obsolete"
> fi
> ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> # Hide the ALL_LINGUAS assigment from automake.
> eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
> POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
> else
> - # The set of available languages was given in configure.in.
> + # The set of available languages was given in configure.ac.
> eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
> fi
> case "$ac_given_srcdir" in
> diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
> index ef05d2d..f37fca0 100644
> --- a/opcodes/ChangeLog
> +++ b/opcodes/ChangeLog
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-18 H.J. Lu <hongjiu.lu@intel.com>
>
> * i386-opc.tbl: Remove Disp32 from AMD64 direct call/jmp.
> diff --git a/opcodes/configure b/opcodes/configure
> index e5048e2..3f31ff2 100755
> --- a/opcodes/configure
> +++ b/opcodes/configure
> @@ -15018,14 +15018,14 @@ _LT_EOF
> if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> # The LINGUAS file contains the set of available languages.
> if test -n "$OBSOLETE_ALL_LINGUAS"; then
> - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.in is obsolete" || echo "setting ALL_LINGUAS in
> configure.in is obsolete"
> + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.ac is obsolete" || echo "setting ALL_LINGUAS in
> configure.ac is obsolete"
> fi
> ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> # Hide the ALL_LINGUAS assigment from automake.
> eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
> POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
> else
> - # The set of available languages was given in configure.in.
> + # The set of available languages was given in configure.ac.
> eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
> fi
> case "$ac_given_srcdir" in
> diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
> index 43abd19..ba8e32b 100644
> --- a/readline/ChangeLog.gdb
> +++ b/readline/ChangeLog.gdb
> @@ -1,3 +1,11 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * INSTALL: Reflects renaming of configure.in to configure.ac
> + * MANIFEST: Reflects renaming of configure.in to configure.ac
> + * aclocal.m4: Reflects renaming of configure.in to configure.ac
> + * configure.ac: Renamed from configure.in
> +
> 2014-12-30 Eli Zaretskii <eliz@gnu.org>
>
> * complete.c (stat_char) [_WIN32]: Don't use 'access' and X_OK on
> diff --git a/readline/INSTALL b/readline/INSTALL
> index a0b0976..625e690 100644
> --- a/readline/INSTALL
> +++ b/readline/INSTALL
> @@ -51,10 +51,10 @@ be considered for the next release. If at some point
> `config.cache' contains results you don't want to keep, you may
> remove or edit it.
>
> -The file `configure.in' is used to create `configure' by a
> -program called `autoconf'. You only need `configure.in' if you
> +The file `configure.ac' is used to create `configure' by a
> +program called `autoconf'. You only need `configure.ac' if you
> want to change it or regenerate `configure' using a newer version
> -of `autoconf'. The readline `configure.in' requires autoconf
> +of `autoconf'. The readline `configure.ac' requires autoconf
> version 2.50 or newer.
>
> Compilers and Options
> diff --git a/readline/MANIFEST b/readline/MANIFEST
> index 8972bdd..ab3c223 100644
> --- a/readline/MANIFEST
> +++ b/readline/MANIFEST
> @@ -18,7 +18,7 @@ USAGE f
> aclocal.m4 f
> config.h.in f
> configure f
> -configure.in f
> +configure.ac f
> Makefile.in f
> ansi_stdlib.h f
> chardefs.h f
> @@ -126,7 +126,7 @@ examples/rlfe/Makefile.in f
> examples/rlfe/README f
> examples/rlfe/config.h.in f
> examples/rlfe/configure f
> -examples/rlfe/configure.in f
> +examples/rlfe/configure.ac f
> examples/rlfe/extern.h f
> examples/rlfe/os.h f
> examples/rlfe/pty.c f
> diff --git a/readline/aclocal.m4 b/readline/aclocal.m4
> index 716a043..6e87227 100644
> --- a/readline/aclocal.m4
> +++ b/readline/aclocal.m4
> @@ -2107,7 +2107,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
> dnl Ideally we would do this search only after the
> dnl if test "$USE_NLS" = "yes"; then
> dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
> - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
> + dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT
> dnl the configure script would need to contain the same shell code
> dnl again, outside any 'if'. There are two solutions:
> dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
> @@ -2329,7 +2329,7 @@ return (int) gettext ("")]ifelse([$2],
> [need-ngettext], [ + (int) ngettext ("",
> AC_SUBST(USE_INCLUDED_LIBINTL)
> AC_SUBST(CATOBJEXT)
>
> - dnl For backward compatibility. Some configure.ins may be using this.
> + dnl For backward compatibility. Some configure.acs may be using this.
> nls_cv_header_intl=
> nls_cv_header_libgt=
>
> @@ -2748,8 +2748,8 @@ dnl the same distribution terms as the rest of
> that program.
> # because gettext's gettext.m4 (distributed in the automake package)
> # still uses it. Otherwise, the use in gettext.m4 makes autoheader
> # give these diagnostics:
> -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
> -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
> +# configure.ac:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
> +# configure.ac:556: AC_TRY_RUN was called before AC_ISC_POSIX
>
> undefine([AC_ISC_POSIX])
>
> @@ -3775,14 +3775,14 @@ AC_DEFUN([AM_PO_SUBDIRS],
> if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> # The LINGUAS file contains the set of available languages.
> if test -n "$OBSOLETE_ALL_LINGUAS"; then
> - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.in is obsolete" || echo "setting ALL_LINGUAS in
> configure.in is obsolete"
> + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.ac is obsolete" || echo "setting ALL_LINGUAS in
> configure.ac is obsolete"
> fi
> ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> # Hide the ALL_LINGUAS assigment from automake.
> eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
> POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
> else
> - # The set of available languages was given in configure.in.
> + # The set of available languages was given in configure.ac.
> eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
> fi
> case "$ac_given_srcdir" in
> diff --git a/readline/configure.ac b/readline/configure.ac
> new file mode 100644
> index 0000000..b395af4
> --- /dev/null
> +++ b/readline/configure.ac
> @@ -0,0 +1,304 @@
> +dnl
> +dnl Configure script for readline library
> +dnl
> +dnl report bugs to chet@po.cwru.edu
> +dnl
> +dnl Process this file with autoconf to produce a configure script.
> +
> +# Copyright (C) 1987-2009 Free Software Foundation, Inc.
> +
> +# This program is free software: you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation, either version 3 of the License, or
> +# (at your option) any later version.
> +
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +
> +# You should have received a copy of the GNU General Public License
> +# along with this program. If not, see <http://www.gnu.org/licenses/>.
> +
> +AC_REVISION([for Readline 6.2, version 2.67])
> +
> +m4_include([../config/override.m4])
> +
> +AC_INIT(readline, 6.2, bug-readline@gnu.org)
> +
> +dnl make sure we are using a recent autoconf version
> +AC_PREREQ(2.50)
> +
> +AC_CONFIG_SRCDIR(readline.h)
> +dnl GDB LOCAL
> +dnl AC_CONFIG_AUX_DIR(./support)
> +AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
> +AC_CONFIG_HEADERS(config.h)
> +
> +dnl update the value of RL_READLINE_VERSION in readline.h when this changes
> +LIBVERSION=6.2
> +
> +AC_CANONICAL_HOST
> +AC_CANONICAL_BUILD
> +
> +dnl configure defaults
> +opt_curses=no
> +opt_purify=no
> +
> +dnl arguments to configure
> +AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses
> library instead of the termcap library]), opt_curses=$withval)
> +AC_ARG_WITH(purify, AC_HELP_STRING([--with-purify], [configure to
> postprocess with purify]), opt_purify=$withval)
> +
> +if test "$opt_curses" = "yes"; then
> + prefer_curses=yes
> +fi
> +
> +if test "$opt_purify" = yes; then
> + PURIFY="purify"
> +else
> + PURIFY=
> +fi
> +
> +dnl option parsing for optional features
> +opt_multibyte=yes
> +opt_static_libs=yes
> +opt_shared_libs=no
> +
> +AC_ARG_ENABLE(multibyte, AC_HELP_STRING([--enable-multibyte], [enable
> multibyte characters if OS supports them]), opt_multibyte=$enableval)
> +dnl AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], [build
> shared libraries [[default=YES]]]), opt_shared_libs=$enableval)
> +AC_ARG_ENABLE(static, AC_HELP_STRING([--enable-static], [build static
> libraries [[default=YES]]]), opt_static_libs=$enableval)
> +
> +if test $opt_multibyte = no; then
> +AC_DEFINE(NO_MULTIBYTE_SUPPORT)
> +fi
> +
> +dnl load up the cross-building cache file -- add more cases and cache
> +dnl files as necessary
> +
> +dnl Note that host and target machine are the same, and different than the
> +dnl build machine.
> +
> +CROSS_COMPILE=
> +if test "x$cross_compiling" = "xyes"; then
> + case "${host}" in
> + *-cygwin*)
> + cross_cache=${srcdir}/cross-build/cygwin.cache
> + ;;
> + *-mingw*)
> + cross_cache=${srcdir}/cross-build/mingw.cache
> + ;;
> + i[[3456]]86-*-beos*)
> + cross_cache=${srcdir}/cross-build/x86-beos.cache
> + ;;
> + *) echo "configure: cross-compiling for $host is not supported" >&2
> + ;;
> + esac
> + if test -n "${cross_cache}" && test -r "${cross_cache}"; then
> + echo "loading cross-build cache file ${cross_cache}"
> + . ${cross_cache}
> + fi
> + unset cross_cache
> + CROSS_COMPILE='-DCROSS_COMPILING'
> + AC_SUBST(CROSS_COMPILE)
> +fi
> +
> +echo ""
> +echo "Beginning configuration for readline-$LIBVERSION for
> ${host_cpu}-${host_vendor}-${host_os}"
> +echo ""
> +
> +# We want these before the checks, so the checks can modify their values.
> +test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1
> +
> +AC_PROG_MAKE_SET
> +AC_PROG_CC
> +dnl AC_AIX
> +AC_MINIX
> +
> +# If we're using gcc and the user hasn't specified CFLAGS, add -O to CFLAGS.
> +test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O"
> +
> +AC_PROG_GCC_TRADITIONAL
> +AC_PROG_INSTALL
> +AC_CHECK_PROG(AR, ar, , ar)
> +dnl Set default for ARFLAGS, since autoconf does not have a macro for it.
> +dnl This allows people to set it when running configure or make
> +test -n "$ARFLAGS" || ARFLAGS="cr"
> +AC_PROG_RANLIB
> +
> +MAKE_SHELL=/bin/sh
> +AC_SUBST(MAKE_SHELL)
> +
> +AC_C_CONST
> +AC_C_PROTOTYPES
> +AC_C_CHAR_UNSIGNED
> +AC_C_VOLATILE
> +
> +AC_TYPE_SIGNAL
> +
> +AC_TYPE_SIZE_T
> +AC_CHECK_TYPE(ssize_t, int)
> +
> +AC_HEADER_STDC
> +
> +AC_HEADER_STAT
> +AC_HEADER_DIRENT
> +
> +AC_CHECK_FUNCS(fcntl kill lstat)
> +AC_CHECK_FUNCS(memmove putenv select setenv setlocale \
> + strcasecmp strpbrk tcgetattr vsnprintf)
> +AC_CHECK_FUNCS(isascii isxdigit)
> +AC_CHECK_FUNCS(getpwent getpwnam getpwuid)
> +
> +AC_FUNC_STRCOLL
> +
> +AC_CHECK_HEADERS(fcntl.h unistd.h stdlib.h varargs.h stdarg.h
> string.h strings.h \
> + limits.h locale.h pwd.h memory.h termcap.h termios.h termio.h)
> +AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h)
> +
> +AC_CHECK_HEADERS(sys/ptem.h,,,
> +[[
> +#if HAVE_SYS_STREAM_H
> +# include <sys/stream.h>
> +#endif
> +]])
> +
> +AC_SYS_LARGEFILE
> +
> +BASH_SYS_SIGNAL_VINTAGE
> +BASH_SYS_REINSTALL_SIGHANDLERS
> +
> +BASH_FUNC_POSIX_SETJMP
> +BASH_FUNC_LSTAT
> +BASH_FUNC_STRCOLL
> +BASH_FUNC_CTYPE_NONASCII
> +
> +BASH_CHECK_GETPW_FUNCS
> +
> +AC_HEADER_TIOCGWINSZ
> +
> +BASH_TYPE_SIG_ATOMIC_T
> +BASH_TYPE_SIGHANDLER
> +
> +BASH_HAVE_TIOCSTAT
> +BASH_HAVE_FIONREAD
> +BASH_CHECK_SPEED_T
> +BASH_STRUCT_WINSIZE
> +BASH_STRUCT_DIRENT_D_INO
> +BASH_STRUCT_DIRENT_D_FILENO
> +
> +dnl yuck
> +case "$host_os" in
> +aix*) prefer_curses=yes ;;
> +esac
> +BASH_CHECK_LIB_TERMCAP
> +if test "$TERMCAP_LIB" = "./lib/termcap/libtermcap.a"; then
> + if test "$prefer_curses" = yes; then
> + TERMCAP_LIB=-lcurses
> + else
> + TERMCAP_LIB=-ltermcap #default
> + fi
> +fi
> +
> +BASH_CHECK_MULTIBYTE
> +
> +case "$host_cpu" in
> +*cray*) LOCAL_CFLAGS=-DCRAY ;;
> +*s390*) LOCAL_CFLAGS=-fsigned-char ;;
> +esac
> +
> +case "$host_os" in
> +isc*) LOCAL_CFLAGS=-Disc386 ;;
> +esac
> +
> +# shared library configuration section
> +#
> +# Shared object configuration section. These values are generated by
> +# ${srcdir}/support/shobj-conf
> +#
> +if test -f ${srcdir}/support/shobj-conf; then
> + AC_MSG_CHECKING(configuration for building shared libraries)
> + eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh}
> ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os}
> -v ${host_vendor}`
> +
> +# case "$SHLIB_LIBS" in
> +# *curses*|*termcap*|*termlib*) ;;
> +# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
> +# esac
> +
> + AC_SUBST(SHOBJ_CC)
> + AC_SUBST(SHOBJ_CFLAGS)
> + AC_SUBST(SHOBJ_LD)
> + AC_SUBST(SHOBJ_LDFLAGS)
> + AC_SUBST(SHOBJ_XLDFLAGS)
> + AC_SUBST(SHOBJ_LIBS)
> + AC_SUBST(SHOBJ_STATUS)
> + AC_SUBST(SHLIB_STATUS)
> + AC_SUBST(SHLIB_XLDFLAGS)
> + AC_SUBST(SHLIB_DOT)
> + AC_SUBST(SHLIB_LIBPREF)
> + AC_SUBST(SHLIB_LIBSUFF)
> + AC_SUBST(SHLIB_LIBVERSION)
> + AC_SUBST(SHLIB_DLLVERSION)
> + AC_SUBST(SHLIB_LIBS)
> + AC_MSG_RESULT($SHLIB_STATUS)
> +
> + # SHLIB_STATUS is either `supported' or `unsupported'. If it's
> + # `unsupported', turn off any default shared library building
> + if test "$SHLIB_STATUS" = 'unsupported'; then
> + opt_shared_libs=no
> + fi
> +
> + # shared library versioning
> + # quoted for m4 so I can use character classes
> + SHLIB_MAJOR=[`expr "$LIBVERSION" : '\([0-9]\)\..*'`]
> + SHLIB_MINOR=[`expr "$LIBVERSION" : '[0-9]\.\([0-9]\).*'`]
> + AC_SUBST(SHLIB_MAJOR)
> + AC_SUBST(SHLIB_MINOR)
> +fi
> +
> +if test "$opt_static_libs" = "yes"; then
> + STATIC_TARGET=static
> + STATIC_INSTALL_TARGET=install-static
> +fi
> +if test "$opt_shared_libs" = "yes"; then
> + SHARED_TARGET=shared
> + SHARED_INSTALL_TARGET=install-shared
> +fi
> +
> +AC_SUBST(STATIC_TARGET)
> +AC_SUBST(SHARED_TARGET)
> +AC_SUBST(STATIC_INSTALL_TARGET)
> +AC_SUBST(SHARED_INSTALL_TARGET)
> +
> +case "$build_os" in
> +msdosdjgpp*) BUILD_DIR=`pwd.exe` ;; # to prevent //d/path/file
> +*) BUILD_DIR=`pwd` ;;
> +esac
> +
> +case "$BUILD_DIR" in
> +*\ *) BUILD_DIR=`echo "$BUILD_DIR" | sed 's: :\\\\ :g'` ;;
> +*) ;;
> +esac
> +
> +AC_SUBST(PURIFY)
> +AC_SUBST(BUILD_DIR)
> +
> +AC_SUBST(CFLAGS)
> +AC_SUBST(LOCAL_CFLAGS)
> +AC_SUBST(LOCAL_LDFLAGS)
> +AC_SUBST(LOCAL_DEFS)
> +
> +AC_SUBST(AR)
> +AC_SUBST(ARFLAGS)
> +
> +AC_SUBST(host_cpu)
> +AC_SUBST(host_os)
> +
> +AC_SUBST(LIBVERSION)
> +
> +AC_SUBST(TERMCAP_LIB)
> +
> +AC_OUTPUT([Makefile doc/Makefile examples/Makefile shlib/Makefile],
> +[
> +# Makefile uses this timestamp file to record whether config.h is up to date.
> +echo > stamp-h
> +])
> diff --git a/readline/configure.in b/readline/configure.in
> deleted file mode 100644
> index b395af4..0000000
> --- a/readline/configure.in
> +++ /dev/null
> @@ -1,304 +0,0 @@
> -dnl
> -dnl Configure script for readline library
> -dnl
> -dnl report bugs to chet@po.cwru.edu
> -dnl
> -dnl Process this file with autoconf to produce a configure script.
> -
> -# Copyright (C) 1987-2009 Free Software Foundation, Inc.
> -
> -# This program is free software: you can redistribute it and/or modify
> -# it under the terms of the GNU General Public License as published by
> -# the Free Software Foundation, either version 3 of the License, or
> -# (at your option) any later version.
> -
> -# This program is distributed in the hope that it will be useful,
> -# but WITHOUT ANY WARRANTY; without even the implied warranty of
> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> -# GNU General Public License for more details.
> -
> -# You should have received a copy of the GNU General Public License
> -# along with this program. If not, see <http://www.gnu.org/licenses/>.
> -
> -AC_REVISION([for Readline 6.2, version 2.67])
> -
> -m4_include([../config/override.m4])
> -
> -AC_INIT(readline, 6.2, bug-readline@gnu.org)
> -
> -dnl make sure we are using a recent autoconf version
> -AC_PREREQ(2.50)
> -
> -AC_CONFIG_SRCDIR(readline.h)
> -dnl GDB LOCAL
> -dnl AC_CONFIG_AUX_DIR(./support)
> -AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
> -AC_CONFIG_HEADERS(config.h)
> -
> -dnl update the value of RL_READLINE_VERSION in readline.h when this changes
> -LIBVERSION=6.2
> -
> -AC_CANONICAL_HOST
> -AC_CANONICAL_BUILD
> -
> -dnl configure defaults
> -opt_curses=no
> -opt_purify=no
> -
> -dnl arguments to configure
> -AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses
> library instead of the termcap library]), opt_curses=$withval)
> -AC_ARG_WITH(purify, AC_HELP_STRING([--with-purify], [configure to
> postprocess with purify]), opt_purify=$withval)
> -
> -if test "$opt_curses" = "yes"; then
> - prefer_curses=yes
> -fi
> -
> -if test "$opt_purify" = yes; then
> - PURIFY="purify"
> -else
> - PURIFY=
> -fi
> -
> -dnl option parsing for optional features
> -opt_multibyte=yes
> -opt_static_libs=yes
> -opt_shared_libs=no
> -
> -AC_ARG_ENABLE(multibyte, AC_HELP_STRING([--enable-multibyte], [enable
> multibyte characters if OS supports them]), opt_multibyte=$enableval)
> -dnl AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], [build
> shared libraries [[default=YES]]]), opt_shared_libs=$enableval)
> -AC_ARG_ENABLE(static, AC_HELP_STRING([--enable-static], [build static
> libraries [[default=YES]]]), opt_static_libs=$enableval)
> -
> -if test $opt_multibyte = no; then
> -AC_DEFINE(NO_MULTIBYTE_SUPPORT)
> -fi
> -
> -dnl load up the cross-building cache file -- add more cases and cache
> -dnl files as necessary
> -
> -dnl Note that host and target machine are the same, and different than the
> -dnl build machine.
> -
> -CROSS_COMPILE=
> -if test "x$cross_compiling" = "xyes"; then
> - case "${host}" in
> - *-cygwin*)
> - cross_cache=${srcdir}/cross-build/cygwin.cache
> - ;;
> - *-mingw*)
> - cross_cache=${srcdir}/cross-build/mingw.cache
> - ;;
> - i[[3456]]86-*-beos*)
> - cross_cache=${srcdir}/cross-build/x86-beos.cache
> - ;;
> - *) echo "configure: cross-compiling for $host is not supported" >&2
> - ;;
> - esac
> - if test -n "${cross_cache}" && test -r "${cross_cache}"; then
> - echo "loading cross-build cache file ${cross_cache}"
> - . ${cross_cache}
> - fi
> - unset cross_cache
> - CROSS_COMPILE='-DCROSS_COMPILING'
> - AC_SUBST(CROSS_COMPILE)
> -fi
> -
> -echo ""
> -echo "Beginning configuration for readline-$LIBVERSION for
> ${host_cpu}-${host_vendor}-${host_os}"
> -echo ""
> -
> -# We want these before the checks, so the checks can modify their values.
> -test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1
> -
> -AC_PROG_MAKE_SET
> -AC_PROG_CC
> -dnl AC_AIX
> -AC_MINIX
> -
> -# If we're using gcc and the user hasn't specified CFLAGS, add -O to CFLAGS.
> -test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O"
> -
> -AC_PROG_GCC_TRADITIONAL
> -AC_PROG_INSTALL
> -AC_CHECK_PROG(AR, ar, , ar)
> -dnl Set default for ARFLAGS, since autoconf does not have a macro for it.
> -dnl This allows people to set it when running configure or make
> -test -n "$ARFLAGS" || ARFLAGS="cr"
> -AC_PROG_RANLIB
> -
> -MAKE_SHELL=/bin/sh
> -AC_SUBST(MAKE_SHELL)
> -
> -AC_C_CONST
> -AC_C_PROTOTYPES
> -AC_C_CHAR_UNSIGNED
> -AC_C_VOLATILE
> -
> -AC_TYPE_SIGNAL
> -
> -AC_TYPE_SIZE_T
> -AC_CHECK_TYPE(ssize_t, int)
> -
> -AC_HEADER_STDC
> -
> -AC_HEADER_STAT
> -AC_HEADER_DIRENT
> -
> -AC_CHECK_FUNCS(fcntl kill lstat)
> -AC_CHECK_FUNCS(memmove putenv select setenv setlocale \
> - strcasecmp strpbrk tcgetattr vsnprintf)
> -AC_CHECK_FUNCS(isascii isxdigit)
> -AC_CHECK_FUNCS(getpwent getpwnam getpwuid)
> -
> -AC_FUNC_STRCOLL
> -
> -AC_CHECK_HEADERS(fcntl.h unistd.h stdlib.h varargs.h stdarg.h
> string.h strings.h \
> - limits.h locale.h pwd.h memory.h termcap.h termios.h termio.h)
> -AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h)
> -
> -AC_CHECK_HEADERS(sys/ptem.h,,,
> -[[
> -#if HAVE_SYS_STREAM_H
> -# include <sys/stream.h>
> -#endif
> -]])
> -
> -AC_SYS_LARGEFILE
> -
> -BASH_SYS_SIGNAL_VINTAGE
> -BASH_SYS_REINSTALL_SIGHANDLERS
> -
> -BASH_FUNC_POSIX_SETJMP
> -BASH_FUNC_LSTAT
> -BASH_FUNC_STRCOLL
> -BASH_FUNC_CTYPE_NONASCII
> -
> -BASH_CHECK_GETPW_FUNCS
> -
> -AC_HEADER_TIOCGWINSZ
> -
> -BASH_TYPE_SIG_ATOMIC_T
> -BASH_TYPE_SIGHANDLER
> -
> -BASH_HAVE_TIOCSTAT
> -BASH_HAVE_FIONREAD
> -BASH_CHECK_SPEED_T
> -BASH_STRUCT_WINSIZE
> -BASH_STRUCT_DIRENT_D_INO
> -BASH_STRUCT_DIRENT_D_FILENO
> -
> -dnl yuck
> -case "$host_os" in
> -aix*) prefer_curses=yes ;;
> -esac
> -BASH_CHECK_LIB_TERMCAP
> -if test "$TERMCAP_LIB" = "./lib/termcap/libtermcap.a"; then
> - if test "$prefer_curses" = yes; then
> - TERMCAP_LIB=-lcurses
> - else
> - TERMCAP_LIB=-ltermcap #default
> - fi
> -fi
> -
> -BASH_CHECK_MULTIBYTE
> -
> -case "$host_cpu" in
> -*cray*) LOCAL_CFLAGS=-DCRAY ;;
> -*s390*) LOCAL_CFLAGS=-fsigned-char ;;
> -esac
> -
> -case "$host_os" in
> -isc*) LOCAL_CFLAGS=-Disc386 ;;
> -esac
> -
> -# shared library configuration section
> -#
> -# Shared object configuration section. These values are generated by
> -# ${srcdir}/support/shobj-conf
> -#
> -if test -f ${srcdir}/support/shobj-conf; then
> - AC_MSG_CHECKING(configuration for building shared libraries)
> - eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh}
> ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os}
> -v ${host_vendor}`
> -
> -# case "$SHLIB_LIBS" in
> -# *curses*|*termcap*|*termlib*) ;;
> -# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
> -# esac
> -
> - AC_SUBST(SHOBJ_CC)
> - AC_SUBST(SHOBJ_CFLAGS)
> - AC_SUBST(SHOBJ_LD)
> - AC_SUBST(SHOBJ_LDFLAGS)
> - AC_SUBST(SHOBJ_XLDFLAGS)
> - AC_SUBST(SHOBJ_LIBS)
> - AC_SUBST(SHOBJ_STATUS)
> - AC_SUBST(SHLIB_STATUS)
> - AC_SUBST(SHLIB_XLDFLAGS)
> - AC_SUBST(SHLIB_DOT)
> - AC_SUBST(SHLIB_LIBPREF)
> - AC_SUBST(SHLIB_LIBSUFF)
> - AC_SUBST(SHLIB_LIBVERSION)
> - AC_SUBST(SHLIB_DLLVERSION)
> - AC_SUBST(SHLIB_LIBS)
> - AC_MSG_RESULT($SHLIB_STATUS)
> -
> - # SHLIB_STATUS is either `supported' or `unsupported'. If it's
> - # `unsupported', turn off any default shared library building
> - if test "$SHLIB_STATUS" = 'unsupported'; then
> - opt_shared_libs=no
> - fi
> -
> - # shared library versioning
> - # quoted for m4 so I can use character classes
> - SHLIB_MAJOR=[`expr "$LIBVERSION" : '\([0-9]\)\..*'`]
> - SHLIB_MINOR=[`expr "$LIBVERSION" : '[0-9]\.\([0-9]\).*'`]
> - AC_SUBST(SHLIB_MAJOR)
> - AC_SUBST(SHLIB_MINOR)
> -fi
> -
> -if test "$opt_static_libs" = "yes"; then
> - STATIC_TARGET=static
> - STATIC_INSTALL_TARGET=install-static
> -fi
> -if test "$opt_shared_libs" = "yes"; then
> - SHARED_TARGET=shared
> - SHARED_INSTALL_TARGET=install-shared
> -fi
> -
> -AC_SUBST(STATIC_TARGET)
> -AC_SUBST(SHARED_TARGET)
> -AC_SUBST(STATIC_INSTALL_TARGET)
> -AC_SUBST(SHARED_INSTALL_TARGET)
> -
> -case "$build_os" in
> -msdosdjgpp*) BUILD_DIR=`pwd.exe` ;; # to prevent //d/path/file
> -*) BUILD_DIR=`pwd` ;;
> -esac
> -
> -case "$BUILD_DIR" in
> -*\ *) BUILD_DIR=`echo "$BUILD_DIR" | sed 's: :\\\\ :g'` ;;
> -*) ;;
> -esac
> -
> -AC_SUBST(PURIFY)
> -AC_SUBST(BUILD_DIR)
> -
> -AC_SUBST(CFLAGS)
> -AC_SUBST(LOCAL_CFLAGS)
> -AC_SUBST(LOCAL_LDFLAGS)
> -AC_SUBST(LOCAL_DEFS)
> -
> -AC_SUBST(AR)
> -AC_SUBST(ARFLAGS)
> -
> -AC_SUBST(host_cpu)
> -AC_SUBST(host_os)
> -
> -AC_SUBST(LIBVERSION)
> -
> -AC_SUBST(TERMCAP_LIB)
> -
> -AC_OUTPUT([Makefile doc/Makefile examples/Makefile shlib/Makefile],
> -[
> -# Makefile uses this timestamp file to record whether config.h is up to date.
> -echo > stamp-h
> -])
> diff --git a/readline/examples/rlfe/ChangeLog b/readline/examples/rlfe/ChangeLog
> index ba41b2b..663dcb9 100644
> --- a/readline/examples/rlfe/ChangeLog
> +++ b/readline/examples/rlfe/ChangeLog
> @@ -1,3 +1,9 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * Makefile.in: Reflects renaming of configure.in to configure.ac
> + * configure.ac: Renamed from configure.in
> +
> 2004-11-04 Per Bothner <per@bothner.com>
>
> * pty.c: Import from screen-4.0.2.
> diff --git a/readline/examples/rlfe/Makefile.in
> b/readline/examples/rlfe/Makefile.in
> index 7d6fd53..702915c 100644
> --- a/readline/examples/rlfe/Makefile.in
> +++ b/readline/examples/rlfe/Makefile.in
> @@ -43,7 +43,7 @@ SHELL=/bin/sh
>
> CFILES= rlfe.c pty.c
> HFILES= extern.h os.h screen.h
> -EXTRA_DIST=configure.in configure Makefile.in config.h.in ChangeLog README
> +EXTRA_DIST=configure.ac configure Makefile.in config.h.in ChangeLog README
> OFILES= rlfe.o pty.o
>
> all: rlfe
> @@ -175,7 +175,7 @@ Makefile makefile: config.status $(srcdir)/Makefile.in
> config.status: $(srcdir)/configure
> $(SHELL) ./config.status --recheck
>
> -$(srcdir)/configure: $(srcdir)/configure.in
> +$(srcdir)/configure: $(srcdir)/configure.ac
> cd $(srcdir) && autoconf
>
> ###############################################################################
> diff --git a/readline/examples/rlfe/configure.ac
> b/readline/examples/rlfe/configure.ac
> new file mode 100644
> index 0000000..108cd3f
> --- /dev/null
> +++ b/readline/examples/rlfe/configure.ac
> @@ -0,0 +1,442 @@
> +dnl Process this file with autoconf to produce a configure script.
> +
> +m4_include([../../../config/override.m4])
> +
> +AC_INIT(rlfe.c)
> +AC_CONFIG_HEADER(config.h)
> +VERSION=0.4
> +AC_SUBST(VERSION)
> +
> +dnl
> +dnl Define some useful macros
> +dnl
> +AC_DEFUN([AC_PROGRAM_SOURCE],
> +[AC_REQUIRE([AC_PROG_CPP])AC_PROVIDE([$0])cat > conftest.c <<EOF
> +#include "confdefs.h"
> +[$1]
> +_CUT_HERE_
> +[$2]
> +EOF
> +eval "$ac_cpp conftest.c 2>&5 | sed -e '1,/_CUT_HERE_/d' -e 's/ //g'
>> conftest.out"
> +. ./conftest.out
> +rm -f conftest*
> +])dnl
> +dnl
> +define(AC_NOTE,
> +[echo "$1" 1>&AC_FD_MSG
> +])dnl
> +
> +old_CFLAGS="$CFLAGS"
> +AC_PROG_CC
> +AC_PROG_CPP
> +AC_PROG_GCC_TRADITIONAL
> +AC_ISC_POSIX
> +
> +AC_TRY_RUN(main(){exit(0);},,[
> +if test $CC != cc ; then
> +AC_NOTE(Your $CC failed - restarting with CC=cc)
> +AC_NOTE()
> +CC=cc
> +export CC
> +exec $0 $configure_args
> +fi
> +])
> +
> +AC_TRY_RUN(main(){exit(0);},,
> +exec 5>&2
> +eval $ac_link
> +AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;)
> +AC_NOTE($ac_compile)
> +AC_MSG_ERROR(Can't run the compiler - sorry))
> +
> +AC_TRY_RUN([
> +main()
> +{
> + int __something_strange_();
> + __something_strange_(0);
> +}
> +],AC_MSG_ERROR(Your compiler does not set the exit status - sorry))
> +
> +AC_PROG_AWK
> +
> +if test -f etc/toolcheck; then
> +AC_CHECKING(for buggy tools)
> +sh etc/toolcheck 1>&AC_FD_MSG
> +fi
> +
> +dnl
> +dnl **** special unix variants ****
> +dnl
> +
> +AC_CHECKING(for System V)
> +AC_TRY_COMPILE(
> +[#include <sys/types.h>
> +#include <signal.h>
> +#include <fcntl.h>], [int x = SIGCHLD | FNDELAY;], , AC_DEFINE(SYSV))
> +
> +AC_CHECKING(for Solaris 2.x)
> +AC_EGREP_CPP(yes,
> +[#if defined(SVR4) && defined(sun)
> + yes
> +#endif
> +], LIBS="$LIBS -lsocket -lnsl -lkstat")
> +
> +dnl
> +dnl **** select() ****
> +dnl
> +
> +AC_CHECKING(select)
> +AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],,
> +LIBS="$LIBS -lnet -lnsl"
> +AC_CHECKING(select with $LIBS)
> +AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],,
> +AC_MSG_ERROR(!!! no select - no screen))
> +)
> +dnl
> +dnl **** check the select implementation ****
> +dnl
> +
> +AC_CHECKING(select return value)
> +AC_TRY_RUN([
> +#include <sys/types.h>
> +#include <sys/stat.h>
> +#include <fcntl.h>
> +
> +char *nam = "/tmp/conftest$$";
> +
> +#ifdef NAMEDPIPE
> +
> +#ifndef O_NONBLOCK
> +#define O_NONBLOCK O_NDELAY
> +#endif
> +#ifndef S_IFIFO
> +#define S_IFIFO 0010000
> +#endif
> +
> +
> +main()
> +{
> +#ifdef FD_SET
> + fd_set f;
> +#else
> + int f;
> +#endif
> +
> +#ifdef __FreeBSD__
> +/* From Andrew A. Chernov (ache@astral.msk.su):
> + * opening RDWR fifo fails in BSD 4.4, but select return values are
> + * right.
> + */
> + exit(0);
> +#endif
> + (void)alarm(5);
> +#ifdef POSIX
> + if (mkfifo(nam, 0777))
> +#else
> + if (mknod(nam, S_IFIFO|0777, 0))
> +#endif
> + exit(1);
> + close(0);
> + if (open(nam, O_RDWR | O_NONBLOCK))
> + exit(1);
> + if (write(0, "TEST", 4) == -1)
> + exit(1);
> +
> +#else
> +
> +#include <sys/types.h>
> +#include <sys/socket.h>
> +#include <sys/un.h>
> +
> +main()
> +{
> + int s1, s2, l;
> + struct sockaddr_un a;
> +#ifdef FD_SET
> + fd_set f;
> +#else
> + int f;
> +#endif
> +
> + (void)alarm(5);
> + if ((s1 = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
> + exit(1);
> + a.sun_family = AF_UNIX;
> + strcpy(a.sun_path, nam);
> + (void) unlink(nam);
> + if (bind(s1, (struct sockaddr *) &a, strlen(nam)+2) == -1)
> + exit(1);
> + if (listen(s1, 2))
> + exit(1);
> + if (fork() == 0)
> + {
> + if ((s2 = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
> + kill(getppid(), 3);
> + (void)connect(s2, (struct sockaddr *)&a, strlen(nam) + 2);
> + if (write(s2, "HELLO", 5) == -1)
> + kill(getppid(), 3);
> + exit(0);
> + }
> + l = sizeof(a);
> + close(0);
> + if (accept(s1, (struct sockaddr *)&a, &l))
> + exit(1);
> +#endif
> +
> +
> +#ifdef FD_SET
> + FD_SET(0, &f);
> +#else
> + f = 1;
> +#endif
> + if (select(1, &f, 0, 0, 0) == -1)
> + exit(1);
> + if (select(1, &f, &f, 0, 0) != 2)
> + exit(1);
> + exit(0);
> +}
> +],AC_NOTE(- select is ok),
> +AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN))
> +
> +dnl
> +dnl **** termcap or terminfo ****
> +dnl
> +AC_CHECKING(for tgetent)
> +AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
> +olibs="$LIBS"
> +LIBS="-lcurses $olibs"
> +AC_CHECKING(libcurses)
> +AC_TRY_LINK(,[
> +#ifdef __hpux
> +__sorry_hpux_libcurses_is_totally_broken_in_10_10();
> +#else
> +tgetent((char *)0, (char *)0);
> +#endif
> +],,
> +LIBS="-ltermcap $olibs"
> +AC_CHECKING(libtermcap)
> +AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
> +LIBS="-ltermlib $olibs"
> +AC_CHECKING(libtermlib)
> +AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
> +LIBS="-lncurses $olibs"
> +AC_CHECKING(libncurses)
> +AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
> +AC_MSG_ERROR(!!! no tgetent - no screen))))))
> +
> +AC_TRY_RUN([
> +main()
> +{
> + exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
> +}], AC_NOTE(- you use the termcap database),
> +AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO))
> +AC_CHECKING(ospeed)
> +AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
> +
> +dnl
> +dnl **** PTY specific things ****
> +dnl
> +AC_CHECKING(for /dev/ptc)
> +if test -r /dev/ptc; then
> +AC_DEFINE(HAVE_DEV_PTC)
> +fi
> +
> +AC_CHECKING(for SVR4 ptys)
> +sysvr4ptys=
> +if test -c /dev/ptmx ; then
> +AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS)
> +sysvr4ptys=1])
> +fi
> +
> +AC_CHECK_FUNCS(getpt)
> +
> +dnl check for openpty()
> +if test -z "$sysvr4ptys"; then
> +AC_CHECK_FUNCS(openpty,,
> +[AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"])])
> +fi
> +
> +AC_CHECKING(for ptyranges)
> +if test -d /dev/ptym ; then
> +pdir='/dev/ptym'
> +else
> +pdir='/dev'
> +fi
> +dnl SCO uses ptyp%d
> +AC_EGREP_CPP(yes,
> +[#ifdef M_UNIX
> + yes;
> +#endif
> +], ptys=`echo /dev/ptyp??`, ptys=`echo $pdir/pty??`)
> +dnl if test -c /dev/ptyp19; then
> +dnl ptys=`echo /dev/ptyp??`
> +dnl else
> +dnl ptys=`echo $pdir/pty??`
> +dnl fi
> +if test "$ptys" != "$pdir/pty??" ; then
> +p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u
> | tr -d '\012'`
> +p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u
> | tr -d '\012'`
> +AC_DEFINE_UNQUOTED(PTYRANGE0,"$p0")
> +AC_DEFINE_UNQUOTED(PTYRANGE1,"$p1")
> +fi
> +
> +dnl **** pty mode/group handling ****
> +dnl
> +dnl support provided by Luke Mewburn <lm@rmit.edu.au>, 931222
> +AC_ARG_WITH(pty-mode, [ --with-pty-mode=mode default mode for
> ptys], [ ptymode="${withval}" ])
> +AC_ARG_WITH(pty-group, [ --with-pty-group=group default group for
> ptys], [ ptygrp="${withval}" ])
> +test -n "$ptymode" || ptymode=0620
> +if test -n "$ptygrp" ; then
> +AC_DEFINE_UNQUOTED(PTYMODE, $ptymode)
> +AC_DEFINE_UNQUOTED(PTYGROUP,$ptygrp)
> +else
> +
> +AC_CHECKING(default tty permissions/group)
> +rm -f conftest_grp
> +AC_TRY_RUN([
> +#include <sys/types.h>
> +#include <sys/stat.h>
> +#include <stdio.h>
> +main()
> +{
> + struct stat sb;
> + char *x,*ttyname();
> + int om, m;
> + FILE *fp;
> +
> + if (!(x = ttyname(0))) exit(1);
> + if (stat(x, &sb)) exit(1);
> + om = sb.st_mode;
> + if (om & 002) exit(0);
> + m = system("mesg y");
> + if (m == -1 || m == 127) exit(1);
> + if (stat(x, &sb)) exit(1);
> + m = sb.st_mode;
> + if (chmod(x, om)) exit(1);
> + if (m & 002) exit(0);
> + if (sb.st_gid == getgid()) exit(1);
> + if (!(fp=fopen("conftest_grp", "w")))
> + exit(1);
> + fprintf(fp, "%d\n", sb.st_gid);
> + fclose(fp);
> + exit(0);
> +}
> +],[
> + if test -f conftest_grp; then
> + ptygrp=`cat conftest_grp`
> + AC_NOTE([- pty mode: $ptymode, group: $ptygrp])
> + AC_DEFINE_UNQUOTED(PTYMODE, $ptymode)
> + AC_DEFINE_UNQUOTED(PTYGROUP,$ptygrp)
> + else
> + AC_NOTE(- ptys are world accessable)
> + fi
> +],[
> + WRITEPATH=''
> + XTERMPATH=''
> + AC_PATH_PROG(WRITEPATH, write)
> + AC_PATH_PROG(XTERMPATH, xterm)
> + found=
> + if test -n "$WRITEPATH$XTERMPATH"; then
> + findfollow=
> + lsfollow=
> + found=`find $WRITEPATH $XTERMPATH -follow -print 2>/dev/null`
> + if test -n "$found"; then
> + findfollow=-follow
> + lsfollow=L
> + fi
> + if test -n "$XTERMPATH"; then
> + ptygrpn=`ls -l$lsfollow $XTERMPATH | sed -n -e 1p | $AWK '{print $4}'`
> + if test tty != "$ptygrpn"; then
> + XTERMPATH=
> + fi
> + fi
> + fi
> + if test -n "$WRITEPATH$XTERMPATH"; then
> + found=`find $WRITEPATH $XTERMPATH $findfollow -perm -2000 -print`
> + if test -n "$found"; then
> + ptygrp=`ls -ln$lsfollow $found | sed -n -e 1p | $AWK '{print $4}'`
> + AC_NOTE([- pty mode: $ptymode, group: $ptygrp])
> + AC_DEFINE_UNQUOTED(PTYMODE, $ptymode)
> + AC_DEFINE_UNQUOTED(PTYGROUP,$ptygrp)
> + else
> + AC_NOTE(- ptys are world accessable)
> + fi
> + else
> + AC_NOTE(- can't determine - assume ptys are world accessable)
> + fi
> + ]
> +)
> +rm -f conftest_grp
> +fi
> +
> +dnl
> +dnl **** signal handling ****
> +dnl
> +if test -n "$posix" ; then
> +
> +dnl POSIX has reliable signals with void return type.
> +AC_NOTE(assuming posix signal definition)
> +AC_DEFINE(SIGVOID)
> +
> +else
> +
> +AC_CHECKING(return type of signal handlers)
> +AC_TRY_COMPILE(
> +[#include <sys/types.h>
> +#include <signal.h>
> +#ifdef signal
> +#undef signal
> +#endif
> +extern void (*signal ()) ();], [int i;], AC_DEFINE(SIGVOID))
> +AC_CHECKING(sigset)
> +AC_TRY_LINK([
> +#include <sys/types.h>
> +#include <signal.h>
> +],[
> +#ifdef SIGVOID
> +sigset(0, (void (*)())0);
> +#else
> +sigset(0, (int (*)())0);
> +#endif
> +], AC_DEFINE(USESIGSET))
> +AC_CHECKING(signal implementation)
> +AC_TRY_RUN([
> +#include <sys/types.h>
> +#include <signal.h>
> +
> +#ifndef SIGCLD
> +#define SIGCLD SIGCHLD
> +#endif
> +#ifdef USESIGSET
> +#define signal sigset
> +#endif
> +
> +int got;
> +
> +#ifdef SIGVOID
> +void
> +#endif
> +hand()
> +{
> + got++;
> +}
> +
> +main()
> +{
> + /* on hpux we use sigvec to get bsd signals */
> +#ifdef __hpux
> + (void)signal(SIGCLD, hand);
> + kill(getpid(), SIGCLD);
> + kill(getpid(), SIGCLD);
> + if (got < 2)
> + exit(1);
> +#endif
> + exit(0);
> +}
> +],,AC_DEFINE(SYSVSIGS))
> +
> +fi
> +
> +AC_CHECK_HEADERS(sys/stropts.h sys/wait.h)
> +
> +AC_OUTPUT(Makefile)
> diff --git a/readline/examples/rlfe/configure.in
> b/readline/examples/rlfe/configure.in
> deleted file mode 100644
> index 108cd3f..0000000
> --- a/readline/examples/rlfe/configure.in
> +++ /dev/null
> @@ -1,442 +0,0 @@
> -dnl Process this file with autoconf to produce a configure script.
> -
> -m4_include([../../../config/override.m4])
> -
> -AC_INIT(rlfe.c)
> -AC_CONFIG_HEADER(config.h)
> -VERSION=0.4
> -AC_SUBST(VERSION)
> -
> -dnl
> -dnl Define some useful macros
> -dnl
> -AC_DEFUN([AC_PROGRAM_SOURCE],
> -[AC_REQUIRE([AC_PROG_CPP])AC_PROVIDE([$0])cat > conftest.c <<EOF
> -#include "confdefs.h"
> -[$1]
> -_CUT_HERE_
> -[$2]
> -EOF
> -eval "$ac_cpp conftest.c 2>&5 | sed -e '1,/_CUT_HERE_/d' -e 's/ //g'
>> conftest.out"
> -. ./conftest.out
> -rm -f conftest*
> -])dnl
> -dnl
> -define(AC_NOTE,
> -[echo "$1" 1>&AC_FD_MSG
> -])dnl
> -
> -old_CFLAGS="$CFLAGS"
> -AC_PROG_CC
> -AC_PROG_CPP
> -AC_PROG_GCC_TRADITIONAL
> -AC_ISC_POSIX
> -
> -AC_TRY_RUN(main(){exit(0);},,[
> -if test $CC != cc ; then
> -AC_NOTE(Your $CC failed - restarting with CC=cc)
> -AC_NOTE()
> -CC=cc
> -export CC
> -exec $0 $configure_args
> -fi
> -])
> -
> -AC_TRY_RUN(main(){exit(0);},,
> -exec 5>&2
> -eval $ac_link
> -AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;)
> -AC_NOTE($ac_compile)
> -AC_MSG_ERROR(Can't run the compiler - sorry))
> -
> -AC_TRY_RUN([
> -main()
> -{
> - int __something_strange_();
> - __something_strange_(0);
> -}
> -],AC_MSG_ERROR(Your compiler does not set the exit status - sorry))
> -
> -AC_PROG_AWK
> -
> -if test -f etc/toolcheck; then
> -AC_CHECKING(for buggy tools)
> -sh etc/toolcheck 1>&AC_FD_MSG
> -fi
> -
> -dnl
> -dnl **** special unix variants ****
> -dnl
> -
> -AC_CHECKING(for System V)
> -AC_TRY_COMPILE(
> -[#include <sys/types.h>
> -#include <signal.h>
> -#include <fcntl.h>], [int x = SIGCHLD | FNDELAY;], , AC_DEFINE(SYSV))
> -
> -AC_CHECKING(for Solaris 2.x)
> -AC_EGREP_CPP(yes,
> -[#if defined(SVR4) && defined(sun)
> - yes
> -#endif
> -], LIBS="$LIBS -lsocket -lnsl -lkstat")
> -
> -dnl
> -dnl **** select() ****
> -dnl
> -
> -AC_CHECKING(select)
> -AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],,
> -LIBS="$LIBS -lnet -lnsl"
> -AC_CHECKING(select with $LIBS)
> -AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],,
> -AC_MSG_ERROR(!!! no select - no screen))
> -)
> -dnl
> -dnl **** check the select implementation ****
> -dnl
> -
> -AC_CHECKING(select return value)
> -AC_TRY_RUN([
> -#include <sys/types.h>
> -#include <sys/stat.h>
> -#include <fcntl.h>
> -
> -char *nam = "/tmp/conftest$$";
> -
> -#ifdef NAMEDPIPE
> -
> -#ifndef O_NONBLOCK
> -#define O_NONBLOCK O_NDELAY
> -#endif
> -#ifndef S_IFIFO
> -#define S_IFIFO 0010000
> -#endif
> -
> -
> -main()
> -{
> -#ifdef FD_SET
> - fd_set f;
> -#else
> - int f;
> -#endif
> -
> -#ifdef __FreeBSD__
> -/* From Andrew A. Chernov (ache@astral.msk.su):
> - * opening RDWR fifo fails in BSD 4.4, but select return values are
> - * right.
> - */
> - exit(0);
> -#endif
> - (void)alarm(5);
> -#ifdef POSIX
> - if (mkfifo(nam, 0777))
> -#else
> - if (mknod(nam, S_IFIFO|0777, 0))
> -#endif
> - exit(1);
> - close(0);
> - if (open(nam, O_RDWR | O_NONBLOCK))
> - exit(1);
> - if (write(0, "TEST", 4) == -1)
> - exit(1);
> -
> -#else
> -
> -#include <sys/types.h>
> -#include <sys/socket.h>
> -#include <sys/un.h>
> -
> -main()
> -{
> - int s1, s2, l;
> - struct sockaddr_un a;
> -#ifdef FD_SET
> - fd_set f;
> -#else
> - int f;
> -#endif
> -
> - (void)alarm(5);
> - if ((s1 = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
> - exit(1);
> - a.sun_family = AF_UNIX;
> - strcpy(a.sun_path, nam);
> - (void) unlink(nam);
> - if (bind(s1, (struct sockaddr *) &a, strlen(nam)+2) == -1)
> - exit(1);
> - if (listen(s1, 2))
> - exit(1);
> - if (fork() == 0)
> - {
> - if ((s2 = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
> - kill(getppid(), 3);
> - (void)connect(s2, (struct sockaddr *)&a, strlen(nam) + 2);
> - if (write(s2, "HELLO", 5) == -1)
> - kill(getppid(), 3);
> - exit(0);
> - }
> - l = sizeof(a);
> - close(0);
> - if (accept(s1, (struct sockaddr *)&a, &l))
> - exit(1);
> -#endif
> -
> -
> -#ifdef FD_SET
> - FD_SET(0, &f);
> -#else
> - f = 1;
> -#endif
> - if (select(1, &f, 0, 0, 0) == -1)
> - exit(1);
> - if (select(1, &f, &f, 0, 0) != 2)
> - exit(1);
> - exit(0);
> -}
> -],AC_NOTE(- select is ok),
> -AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN))
> -
> -dnl
> -dnl **** termcap or terminfo ****
> -dnl
> -AC_CHECKING(for tgetent)
> -AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
> -olibs="$LIBS"
> -LIBS="-lcurses $olibs"
> -AC_CHECKING(libcurses)
> -AC_TRY_LINK(,[
> -#ifdef __hpux
> -__sorry_hpux_libcurses_is_totally_broken_in_10_10();
> -#else
> -tgetent((char *)0, (char *)0);
> -#endif
> -],,
> -LIBS="-ltermcap $olibs"
> -AC_CHECKING(libtermcap)
> -AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
> -LIBS="-ltermlib $olibs"
> -AC_CHECKING(libtermlib)
> -AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
> -LIBS="-lncurses $olibs"
> -AC_CHECKING(libncurses)
> -AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
> -AC_MSG_ERROR(!!! no tgetent - no screen))))))
> -
> -AC_TRY_RUN([
> -main()
> -{
> - exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
> -}], AC_NOTE(- you use the termcap database),
> -AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO))
> -AC_CHECKING(ospeed)
> -AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
> -
> -dnl
> -dnl **** PTY specific things ****
> -dnl
> -AC_CHECKING(for /dev/ptc)
> -if test -r /dev/ptc; then
> -AC_DEFINE(HAVE_DEV_PTC)
> -fi
> -
> -AC_CHECKING(for SVR4 ptys)
> -sysvr4ptys=
> -if test -c /dev/ptmx ; then
> -AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS)
> -sysvr4ptys=1])
> -fi
> -
> -AC_CHECK_FUNCS(getpt)
> -
> -dnl check for openpty()
> -if test -z "$sysvr4ptys"; then
> -AC_CHECK_FUNCS(openpty,,
> -[AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"])])
> -fi
> -
> -AC_CHECKING(for ptyranges)
> -if test -d /dev/ptym ; then
> -pdir='/dev/ptym'
> -else
> -pdir='/dev'
> -fi
> -dnl SCO uses ptyp%d
> -AC_EGREP_CPP(yes,
> -[#ifdef M_UNIX
> - yes;
> -#endif
> -], ptys=`echo /dev/ptyp??`, ptys=`echo $pdir/pty??`)
> -dnl if test -c /dev/ptyp19; then
> -dnl ptys=`echo /dev/ptyp??`
> -dnl else
> -dnl ptys=`echo $pdir/pty??`
> -dnl fi
> -if test "$ptys" != "$pdir/pty??" ; then
> -p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u
> | tr -d '\012'`
> -p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u
> | tr -d '\012'`
> -AC_DEFINE_UNQUOTED(PTYRANGE0,"$p0")
> -AC_DEFINE_UNQUOTED(PTYRANGE1,"$p1")
> -fi
> -
> -dnl **** pty mode/group handling ****
> -dnl
> -dnl support provided by Luke Mewburn <lm@rmit.edu.au>, 931222
> -AC_ARG_WITH(pty-mode, [ --with-pty-mode=mode default mode for
> ptys], [ ptymode="${withval}" ])
> -AC_ARG_WITH(pty-group, [ --with-pty-group=group default group for
> ptys], [ ptygrp="${withval}" ])
> -test -n "$ptymode" || ptymode=0620
> -if test -n "$ptygrp" ; then
> -AC_DEFINE_UNQUOTED(PTYMODE, $ptymode)
> -AC_DEFINE_UNQUOTED(PTYGROUP,$ptygrp)
> -else
> -
> -AC_CHECKING(default tty permissions/group)
> -rm -f conftest_grp
> -AC_TRY_RUN([
> -#include <sys/types.h>
> -#include <sys/stat.h>
> -#include <stdio.h>
> -main()
> -{
> - struct stat sb;
> - char *x,*ttyname();
> - int om, m;
> - FILE *fp;
> -
> - if (!(x = ttyname(0))) exit(1);
> - if (stat(x, &sb)) exit(1);
> - om = sb.st_mode;
> - if (om & 002) exit(0);
> - m = system("mesg y");
> - if (m == -1 || m == 127) exit(1);
> - if (stat(x, &sb)) exit(1);
> - m = sb.st_mode;
> - if (chmod(x, om)) exit(1);
> - if (m & 002) exit(0);
> - if (sb.st_gid == getgid()) exit(1);
> - if (!(fp=fopen("conftest_grp", "w")))
> - exit(1);
> - fprintf(fp, "%d\n", sb.st_gid);
> - fclose(fp);
> - exit(0);
> -}
> -],[
> - if test -f conftest_grp; then
> - ptygrp=`cat conftest_grp`
> - AC_NOTE([- pty mode: $ptymode, group: $ptygrp])
> - AC_DEFINE_UNQUOTED(PTYMODE, $ptymode)
> - AC_DEFINE_UNQUOTED(PTYGROUP,$ptygrp)
> - else
> - AC_NOTE(- ptys are world accessable)
> - fi
> -],[
> - WRITEPATH=''
> - XTERMPATH=''
> - AC_PATH_PROG(WRITEPATH, write)
> - AC_PATH_PROG(XTERMPATH, xterm)
> - found=
> - if test -n "$WRITEPATH$XTERMPATH"; then
> - findfollow=
> - lsfollow=
> - found=`find $WRITEPATH $XTERMPATH -follow -print 2>/dev/null`
> - if test -n "$found"; then
> - findfollow=-follow
> - lsfollow=L
> - fi
> - if test -n "$XTERMPATH"; then
> - ptygrpn=`ls -l$lsfollow $XTERMPATH | sed -n -e 1p | $AWK '{print $4}'`
> - if test tty != "$ptygrpn"; then
> - XTERMPATH=
> - fi
> - fi
> - fi
> - if test -n "$WRITEPATH$XTERMPATH"; then
> - found=`find $WRITEPATH $XTERMPATH $findfollow -perm -2000 -print`
> - if test -n "$found"; then
> - ptygrp=`ls -ln$lsfollow $found | sed -n -e 1p | $AWK '{print $4}'`
> - AC_NOTE([- pty mode: $ptymode, group: $ptygrp])
> - AC_DEFINE_UNQUOTED(PTYMODE, $ptymode)
> - AC_DEFINE_UNQUOTED(PTYGROUP,$ptygrp)
> - else
> - AC_NOTE(- ptys are world accessable)
> - fi
> - else
> - AC_NOTE(- can't determine - assume ptys are world accessable)
> - fi
> - ]
> -)
> -rm -f conftest_grp
> -fi
> -
> -dnl
> -dnl **** signal handling ****
> -dnl
> -if test -n "$posix" ; then
> -
> -dnl POSIX has reliable signals with void return type.
> -AC_NOTE(assuming posix signal definition)
> -AC_DEFINE(SIGVOID)
> -
> -else
> -
> -AC_CHECKING(return type of signal handlers)
> -AC_TRY_COMPILE(
> -[#include <sys/types.h>
> -#include <signal.h>
> -#ifdef signal
> -#undef signal
> -#endif
> -extern void (*signal ()) ();], [int i;], AC_DEFINE(SIGVOID))
> -AC_CHECKING(sigset)
> -AC_TRY_LINK([
> -#include <sys/types.h>
> -#include <signal.h>
> -],[
> -#ifdef SIGVOID
> -sigset(0, (void (*)())0);
> -#else
> -sigset(0, (int (*)())0);
> -#endif
> -], AC_DEFINE(USESIGSET))
> -AC_CHECKING(signal implementation)
> -AC_TRY_RUN([
> -#include <sys/types.h>
> -#include <signal.h>
> -
> -#ifndef SIGCLD
> -#define SIGCLD SIGCHLD
> -#endif
> -#ifdef USESIGSET
> -#define signal sigset
> -#endif
> -
> -int got;
> -
> -#ifdef SIGVOID
> -void
> -#endif
> -hand()
> -{
> - got++;
> -}
> -
> -main()
> -{
> - /* on hpux we use sigvec to get bsd signals */
> -#ifdef __hpux
> - (void)signal(SIGCLD, hand);
> - kill(getpid(), SIGCLD);
> - kill(getpid(), SIGCLD);
> - if (got < 2)
> - exit(1);
> -#endif
> - exit(0);
> -}
> -],,AC_DEFINE(SYSVSIGS))
> -
> -fi
> -
> -AC_CHECK_HEADERS(sys/stropts.h sys/wait.h)
> -
> -AC_OUTPUT(Makefile)
> diff --git a/sim/ChangeLog b/sim/ChangeLog
> index 0c0dcd6..6ff0d4b 100644
> --- a/sim/ChangeLog
> +++ b/sim/ChangeLog
> @@ -1,3 +1,9 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * README-HACKING: Reflects renaming of configure.in to configure.ac
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-04-02 H.J. Lu <hongjiu.lu@intel.com>
>
> * arm/configure: Regenerated.
> diff --git a/sim/README-HACKING b/sim/README-HACKING
> index 0a6bbe2..188ca3c 100644
> --- a/sim/README-HACKING
> +++ b/sim/README-HACKING
> @@ -31,11 +31,11 @@ Common Makefile Support
>
> A common configuration framework is available for simulators that want
> to use it. The common framework exists to remove a lot of duplication
> -in configure.in and Makefile.in, and it also provides a foundation for
> +in configure.ac and Makefile.in, and it also provides a foundation for
> enhancing the simulators uniformly (e.g. the more they share in common
> the easier a feature added to one is added to all).
>
> -The configure.in of a simulator using the common framework should look like:
> +The configure.ac of a simulator using the common framework should look like:
>
> --- snip ---
> dnl Process this file with autoconf to produce a configure script.
> diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
> index ebf8618..b243689 100644
> --- a/sim/common/ChangeLog
> +++ b/sim/common/ChangeLog
> @@ -1,3 +1,9 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * acinclude.m4: Reflects renaming of configure.in to configure.ac
> + * sim-config.h: Reflects renaming of configure.in to configure.ac
> +
> 2015-04-29 Nick Clifton <nickc@redhat.com>
>
> PR 18273
> diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
> index 75ea8ea..5b682c4 100644
> --- a/sim/common/acinclude.m4
> +++ b/sim/common/acinclude.m4
> @@ -5,7 +5,7 @@
> # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
> # It is intended to be invoked last.
> #
> -# The simulator's configure.in should look like:
> +# The simulator's configure.ac should look like:
> #
> # dnl Process this file with autoconf to produce a configure script.
> # AC_PREREQ(2.64)dnl
> @@ -263,12 +263,12 @@ sim_link_links="${sim_link_links} targ-vals.def"
> dnl Additional SIM options that can (optionally) be configured
> dnl For optional simulator options, a macro SIM_AC_OPTION_* is defined.
> dnl Simulators that wish to use the relevant option specify the macro
> -dnl in the simulator specific configure.in file between the SIM_AC_COMMON
> +dnl in the simulator specific configure.ac file between the SIM_AC_COMMON
> dnl and SIM_AC_OUTPUT lines.
>
>
> dnl Specify the running environment.
> -dnl If the simulator invokes this in its configure.in then without this option
> +dnl If the simulator invokes this in its configure.ac then without this option
> dnl the default is the user environment and all are runtime selectable.
> dnl If the simulator doesn't invoke this, only the user environment is
> dnl supported.
> diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h
> index 9391994..bf7428c 100644
> --- a/sim/common/sim-config.h
> +++ b/sim/common/sim-config.h
> @@ -360,7 +360,7 @@ enum sim_environment {
> #endif
>
> /* If the simulator doesn't specify SIM_AC_OPTION_ENVIRONMENT in its
> - configure.in, the only supported environment is the user environment. */
> + configure.ac, the only supported environment is the user environment. */
> #ifndef WITH_ENVIRONMENT
> #define WITH_ENVIRONMENT USER_ENVIRONMENT
> #endif
> diff --git a/sim/configure b/sim/configure
> index bf0a094..7c5c5a9 100755
> --- a/sim/configure
> +++ b/sim/configure
> @@ -5090,7 +5090,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
> ac_sub_configure=$ac_srcdir/configure.gnu
> elif test -f "$ac_srcdir/configure"; then
> ac_sub_configure=$ac_srcdir/configure
> - elif test -f "$ac_srcdir/configure.in"; then
> + elif test -f "$ac_srcdir/configure.ac"; then
> # This should be Cygnus configure.
> ac_sub_configure=$ac_aux_dir/configure
> else
> diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
> index 1feeb83..7b68f8a 100644
> --- a/sim/mips/ChangeLog
> +++ b/sim/mips/ChangeLog
> @@ -1,3 +1,9 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * configure: Reflects renaming of configure.in to configure.ac
> + * configure.ac: Reflects renaming of configure.in to configure.ac
> +
> 2015-04-18 Mike Frysinger <vapier@gentoo.org>
>
> * sim-main.h (SIM_ENGINE_HALT_HOOK, SIM_ENGINE_RESTART_HOOK): Delete
> diff --git a/sim/mips/configure b/sim/mips/configure
> index 16367a8..f747569 100755
> --- a/sim/mips/configure
> +++ b/sim/mips/configure
> @@ -2255,7 +2255,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
> # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
> # It is intended to be invoked last.
> #
> -# The simulator's configure.in should look like:
> +# The simulator's configure.ac should look like:
> #
> # dnl Process this file with autoconf to produce a configure script.
> # AC_PREREQ(2.64)dnl
> @@ -13743,7 +13743,7 @@ if test ${sim_gen} = MULTI; then
>
> # Simple sanity check.
> if test -z "${sim_multi_configs}" || test -z "${sim_multi_default}"; then
> - as_fn_error "Error in configure.in: MULTI simulator not set up
> correctly" "$LINENO" 5
> + as_fn_error "Error in configure.ac: MULTI simulator not set up
> correctly" "$LINENO" 5
> fi
>
> # Start in a known state.
> @@ -13868,7 +13868,7 @@ __EOF__
>
> # Check whether we added a 'default:' label.
> if test ${sim_seen_default} = no; then
> - as_fn_error "Error in configure.in: \${sim_multi_configs} doesn't
> have an entry for \${sim_multi_default}" "$LINENO" 5
> + as_fn_error "Error in configure.ac: \${sim_multi_configs} doesn't
> have an entry for \${sim_multi_default}" "$LINENO" 5
> fi
>
> cat << __EOF__ >> multi-run.c
> @@ -13912,7 +13912,7 @@ else
> sim_multi_src=doesnt-exist.c
>
> if test x"${sim_mach_default}" = x""; then
> - as_fn_error "Error in configure.in: \${sim_mach_default} not
> defined" "$LINENO" 5
> + as_fn_error "Error in configure.ac: \${sim_mach_default} not
> defined" "$LINENO" 5
> fi
> SIM_SUBTARGET="$SIM_SUBTARGET
> -DMIPS_MACH_DEFAULT=bfd_mach_${sim_mach_default}"
> fi
> diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
> index 4dee7d4..d786351 100644
> --- a/sim/mips/configure.ac
> +++ b/sim/mips/configure.ac
> @@ -221,7 +221,7 @@ if test ${sim_gen} = MULTI; then
>
> # Simple sanity check.
> if test -z "${sim_multi_configs}" || test -z "${sim_multi_default}"; then
> - AC_MSG_ERROR(Error in configure.in: MULTI simulator not set up correctly)
> + AC_MSG_ERROR(Error in configure.ac: MULTI simulator not set up correctly)
> fi
>
> # Start in a known state.
> @@ -346,7 +346,7 @@ __EOF__
>
> # Check whether we added a 'default:' label.
> if test ${sim_seen_default} = no; then
> - AC_MSG_ERROR(Error in configure.in: \${sim_multi_configs} doesn't
> have an entry for \${sim_multi_default})
> + AC_MSG_ERROR(Error in configure.ac: \${sim_multi_configs} doesn't
> have an entry for \${sim_multi_default})
> fi
>
> cat << __EOF__ >> multi-run.c
> @@ -390,7 +390,7 @@ else
> sim_multi_src=doesnt-exist.c
>
> if test x"${sim_mach_default}" = x""; then
> - AC_MSG_ERROR(Error in configure.in: \${sim_mach_default} not defined)
> + AC_MSG_ERROR(Error in configure.ac: \${sim_mach_default} not defined)
> fi
> SIM_SUBTARGET="$SIM_SUBTARGET
> -DMIPS_MACH_DEFAULT=bfd_mach_${sim_mach_default}"
> fi
> diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
> index 20038f1..48bea54 100644
> --- a/sim/testsuite/ChangeLog
> +++ b/sim/testsuite/ChangeLog
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR binutils/18450
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-04-13 Hans-Peter Nilsson <hp@axis.com>
>
> * sim-defs.exp (sim_init): Unset target ldscript here.
> diff --git a/sim/testsuite/configure b/sim/testsuite/configure
> index c5980fe..38967c4 100755
> --- a/sim/testsuite/configure
> +++ b/sim/testsuite/configure
> @@ -3165,7 +3165,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
> ac_sub_configure=$ac_srcdir/configure.gnu
> elif test -f "$ac_srcdir/configure"; then
> ac_sub_configure=$ac_srcdir/configure
> - elif test -f "$ac_srcdir/configure.in"; then
> + elif test -f "$ac_srcdir/configure.ac"; then
> # This should be Cygnus configure.
> ac_sub_configure=$ac_aux_dir/configure
> else
> diff --git a/src-release.sh b/src-release.sh
> index 40d0126..9668a1a 100755
> --- a/src-release.sh
> +++ b/src-release.sh
> @@ -48,7 +48,7 @@ DEVO_SUPPORT="README Makefile.in configure configure.ac \
> COPYING3 COPYING3.LIB"
>
> # Files in devo/etc used in any net release.
> -ETC_SUPPORT="Makefile.in configure configure.in standards.texi \
> +ETC_SUPPORT="Makefile.in configure configure.ac standards.texi \
> make-stds.texi standards.info* configure.texi configure.info* \
> ChangeLog configbuild.* configdev.* fdl.texi texi2pod.pl gnu-oids.texi"
>
> --
> 2.1.0
Attachment:
binutils-gdb.combined.build.patch.updated
Description: Binary data
Attachment:
gcc.combined.build.patch.updated
Description: Binary data
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |