>From 19be2c9fcf92b6ec92fd051e114d074b496cce70 Mon Sep 17 00:00:00 2001 From: Cyprien Nicolas Date: Thu, 25 Apr 2013 00:17:13 +0200 Subject: [PATCH 2/2] Rename guile-readline/configure from .in to .ac * Rename guile-readline/configure.in to guile-readline/configure.ac. Since automake-1.13, configure.in file produce a warning. --- guile-readline/configure.ac | 86 +++++++++++++++++++++++++++++++++++++++++++++ guile-readline/configure.in | 86 --------------------------------------------- 2 files changed, 86 insertions(+), 86 deletions(-) create mode 100644 guile-readline/configure.ac delete mode 100644 guile-readline/configure.in diff --git a/guile-readline/configure.ac b/guile-readline/configure.ac new file mode 100644 index 0000000..c17bee6 --- /dev/null +++ b/guile-readline/configure.ac @@ -0,0 +1,86 @@ +AC_PREREQ(2.50) + +dnl Don't use "echo -n", which is not portable (e.g., not available on +dnl MacOS X). Instead, use `patsubst' to remove the newline. +AC_INIT(guile-readline, + patsubst(m4_esyscmd(. ../GUILE-VERSION && echo ${GUILE_VERSION}), [ +]), + address@hidden) + +AC_CONFIG_AUX_DIR([.]) +AC_CONFIG_SRCDIR(readline.c) +AC_CONFIG_HEADERS([guile-readline-config.h]) +AM_INIT_AUTOMAKE([foreign no-define]) + +. $srcdir/../GUILE-VERSION + +AC_PROG_INSTALL +AC_PROG_CC +AC_LIBTOOL_WIN32_DLL +AC_PROG_LIBTOOL + +dnl +dnl Check for Winsock and other functionality on Win32 (*not* CygWin) +dnl +AC_CYGWIN +AC_MINGW32 +EXTRA_DEFS="" +if test "$MINGW32" = "yes" ; then + if test $enable_shared = yes ; then + EXTRA_DEFS="-DSCM_IMPORT" + fi +fi +AC_SUBST(EXTRA_DEFS) + +for termlib in ncurses curses termcap terminfo termlib ; do + AC_CHECK_LIB(${termlib}, tgoto, + [LIBS="-l${termlib} $LIBS"; break]) +done + +AC_CHECK_LIB(readline, readline) +if test $ac_cv_lib_readline_readline = no; then + AC_MSG_WARN([libreadline was not found on your system.]) +fi + +AC_CHECK_FUNCS(siginterrupt rl_clear_signals rl_cleanup_after_signal) + +dnl Check for modern readline naming +AC_CHECK_FUNCS(rl_filename_completion_function) + +dnl Check for rl_get_keymap. We only use this for deciding whether to +dnl install paren matching on the Guile command line (when using +dnl readline for input), so it's completely optional. +AC_CHECK_FUNCS(rl_get_keymap) + +AC_CACHE_CHECK([for rl_getc_function pointer in readline], + ac_cv_var_rl_getc_function, + [AC_TRY_LINK([ +#include +#include ], + [printf ("%ld", (long) rl_getc_function)], + [ac_cv_var_rl_getc_function=yes], + [ac_cv_var_rl_getc_function=no])]) +if test "${ac_cv_var_rl_getc_function}" = "yes"; then + AC_DEFINE(HAVE_RL_GETC_FUNCTION, 1, + [Define if your readline library has the rl_getc_function variable.]) +fi + +if test $ac_cv_lib_readline_readline = yes \ + -a $ac_cv_var_rl_getc_function = no; then + AC_MSG_WARN([*** libreadline is too old on your system.]) + AC_MSG_WARN([*** You need readline version 2.1 or later.]) +fi + +AC_CHECK_FUNCS(strdup) + +. $srcdir/LIBGUILEREADLINE-VERSION +AC_SUBST(LIBGUILEREADLINE_MAJOR) +AC_SUBST(LIBGUILEREADLINE_INTERFACE_CURRENT) +AC_SUBST(LIBGUILEREADLINE_INTERFACE_REVISION) +AC_SUBST(LIBGUILEREADLINE_INTERFACE_AGE) +AC_SUBST(LIBGUILEREADLINE_INTERFACE) + +AC_SUBST(GUILE_EFFECTIVE_VERSION) + +AC_CONFIG_FILES(Makefile ice-9/Makefile) +AC_OUTPUT diff --git a/guile-readline/configure.in b/guile-readline/configure.in deleted file mode 100644 index c17bee6..0000000 --- a/guile-readline/configure.in +++ /dev/null @@ -1,86 +0,0 @@ -AC_PREREQ(2.50) - -dnl Don't use "echo -n", which is not portable (e.g., not available on -dnl MacOS X). Instead, use `patsubst' to remove the newline. -AC_INIT(guile-readline, - patsubst(m4_esyscmd(. ../GUILE-VERSION && echo ${GUILE_VERSION}), [ -]), - address@hidden) - -AC_CONFIG_AUX_DIR([.]) -AC_CONFIG_SRCDIR(readline.c) -AC_CONFIG_HEADERS([guile-readline-config.h]) -AM_INIT_AUTOMAKE([foreign no-define]) - -. $srcdir/../GUILE-VERSION - -AC_PROG_INSTALL -AC_PROG_CC -AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL - -dnl -dnl Check for Winsock and other functionality on Win32 (*not* CygWin) -dnl -AC_CYGWIN -AC_MINGW32 -EXTRA_DEFS="" -if test "$MINGW32" = "yes" ; then - if test $enable_shared = yes ; then - EXTRA_DEFS="-DSCM_IMPORT" - fi -fi -AC_SUBST(EXTRA_DEFS) - -for termlib in ncurses curses termcap terminfo termlib ; do - AC_CHECK_LIB(${termlib}, tgoto, - [LIBS="-l${termlib} $LIBS"; break]) -done - -AC_CHECK_LIB(readline, readline) -if test $ac_cv_lib_readline_readline = no; then - AC_MSG_WARN([libreadline was not found on your system.]) -fi - -AC_CHECK_FUNCS(siginterrupt rl_clear_signals rl_cleanup_after_signal) - -dnl Check for modern readline naming -AC_CHECK_FUNCS(rl_filename_completion_function) - -dnl Check for rl_get_keymap. We only use this for deciding whether to -dnl install paren matching on the Guile command line (when using -dnl readline for input), so it's completely optional. -AC_CHECK_FUNCS(rl_get_keymap) - -AC_CACHE_CHECK([for rl_getc_function pointer in readline], - ac_cv_var_rl_getc_function, - [AC_TRY_LINK([ -#include -#include ], - [printf ("%ld", (long) rl_getc_function)], - [ac_cv_var_rl_getc_function=yes], - [ac_cv_var_rl_getc_function=no])]) -if test "${ac_cv_var_rl_getc_function}" = "yes"; then - AC_DEFINE(HAVE_RL_GETC_FUNCTION, 1, - [Define if your readline library has the rl_getc_function variable.]) -fi - -if test $ac_cv_lib_readline_readline = yes \ - -a $ac_cv_var_rl_getc_function = no; then - AC_MSG_WARN([*** libreadline is too old on your system.]) - AC_MSG_WARN([*** You need readline version 2.1 or later.]) -fi - -AC_CHECK_FUNCS(strdup) - -. $srcdir/LIBGUILEREADLINE-VERSION -AC_SUBST(LIBGUILEREADLINE_MAJOR) -AC_SUBST(LIBGUILEREADLINE_INTERFACE_CURRENT) -AC_SUBST(LIBGUILEREADLINE_INTERFACE_REVISION) -AC_SUBST(LIBGUILEREADLINE_INTERFACE_AGE) -AC_SUBST(LIBGUILEREADLINE_INTERFACE) - -AC_SUBST(GUILE_EFFECTIVE_VERSION) - -AC_CONFIG_FILES(Makefile ice-9/Makefile) -AC_OUTPUT -- 1.7.11.7