diff --git a/config.h.in b/config.h.in index 2d1c4f5..95d6afb 100644 --- a/config.h.in +++ b/config.h.in @@ -22,6 +22,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SGTTY_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SIGNAL_H + /* Define to 1 if `stat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_STAT_EMPTY_STRING_BUG diff --git a/configure b/configure index 19613c9..50ea20b 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for Minix editline 0.1.2. +# Generated by GNU Autoconf 2.61 for Minix editline 0.1.3. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Minix editline' PACKAGE_TARNAME='minix-editline' -PACKAGE_VERSION='0.1.2' -PACKAGE_STRING='Minix editline 0.1.2' +PACKAGE_VERSION='0.1.3' +PACKAGE_STRING='Minix editline 0.1.3' PACKAGE_BUGREPORT='joachim@vmlinux.org' ac_unique_file="src/editline.c" @@ -1208,7 +1208,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Minix editline 0.1.2 to adapt to many kinds of systems. +\`configure' configures Minix editline 0.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1274,7 +1274,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Minix editline 0.1.2:";; + short | recursive ) echo "Configuration of Minix editline 0.1.3:";; esac cat <<\_ACEOF @@ -1358,7 +1358,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Minix editline configure 0.1.2 +Minix editline configure 0.1.3 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1372,7 +1372,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Minix editline $as_me 0.1.2, which was +It was created by Minix editline $as_me 0.1.3, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2067,7 +2067,7 @@ fi # Define the identity of the package. PACKAGE='minix-editline' - VERSION='0.1.2' + VERSION='0.1.3' cat >>confdefs.h <<_ACEOF @@ -4290,7 +4290,8 @@ done -for ac_header in malloc.h sgtty.h stdlib.h string.h termio.h termios.h + +for ac_header in malloc.h signal.h sgtty.h stdlib.h string.h termio.h termios.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -5380,7 +5381,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Minix editline $as_me 0.1.2, which was +This file was extended by Minix editline $as_me 0.1.3, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5433,7 +5434,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Minix editline config.status 0.1.2 +Minix editline config.status 0.1.3 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index f3b7911..787d9cb 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(Minix editline, 0.1.2, joachim@vmlinux.org) +AC_INIT(Minix editline, 0.1.3, joachim@vmlinux.org) AC_CONFIG_SRCDIR([src/editline.c]) AC_CONFIG_HEADER([config.h]) @@ -20,7 +20,7 @@ AC_HEADER_DIRENT AC_HEADER_STDC # Check for malloc.h instead of AC_FUNC_MALLOC/REALLOC AIX and others # mess up the traditional malloc check. -AC_CHECK_HEADERS([malloc.h sgtty.h stdlib.h string.h termio.h termios.h]) +AC_CHECK_HEADERS([malloc.h signal.h sgtty.h stdlib.h string.h termio.h termios.h]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STAT diff --git a/examples/Makefile.am b/examples/Makefile.am index 703f1e8..262abdb 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = foreign + LDADD = $(top_builddir)/src/libedit.a AM_CFLAGS = -I$(top_srcdir)/src diff --git a/examples/Makefile.in b/examples/Makefile.in index 39b0c2a..28c6da0 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -142,6 +142,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign LDADD = $(top_builddir)/src/libedit.a AM_CFLAGS = -I$(top_srcdir)/src testit_SOURCES = testit.c @@ -158,9 +159,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/Makefile + $(AUTOMAKE) --foreign examples/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/include/Makefile.am b/include/Makefile.am index b97be20..fc019bb 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,2 +1,4 @@ +AUTOMAKE_OPTIONS = foreign + library_includedir=$(includedir) library_include_HEADERS = editline.h diff --git a/include/Makefile.in b/include/Makefile.in index da811d4..d32cbe8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -139,6 +139,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign library_includedir = $(includedir) library_include_HEADERS = editline.h all: all-am @@ -153,9 +154,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/Makefile + $(AUTOMAKE) --foreign include/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/Makefile.am b/man/Makefile.am index e49bc82..33ab78e 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,2 +1,4 @@ +AUTOMAKE_OPTIONS = foreign + man3_MANS = editline.3 dist_man_MANS = $(man3_MANS) diff --git a/man/Makefile.in b/man/Makefile.in index b8b0a98..2e5a654 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -131,6 +131,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign man3_MANS = editline.3 dist_man_MANS = $(man3_MANS) all: all-am @@ -145,9 +146,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile + $(AUTOMAKE) --foreign man/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/Makefile.am b/src/Makefile.am index 823ea9d..f95fdff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = foreign + lib_LIBRARIES = libedit.a libedit_a_SOURCES = editline.c editline.h complete.c sysunix.c unix.h diff --git a/src/Makefile.in b/src/Makefile.in index 6d9debd..2caa929 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -152,6 +152,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +AUTOMAKE_OPTIONS = foreign lib_LIBRARIES = libedit.a libedit_a_SOURCES = editline.c editline.h complete.c sysunix.c unix.h all: all-am @@ -167,9 +168,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/editline.c b/src/editline.c index 3a91af0..3c54436 100755 --- a/src/editline.c +++ b/src/editline.c @@ -1119,7 +1119,7 @@ find_word() } STATIC STATUS -c_possible() +c_possible(void) { CHAR **av; CHAR *word; @@ -1140,7 +1140,7 @@ c_possible() } STATIC STATUS -c_complete() +c_complete(void) { CHAR *p, *q; CHAR *word, *new; diff --git a/src/editline.h b/src/editline.h index a8741b7..2afa15a 100755 --- a/src/editline.h +++ b/src/editline.h @@ -16,6 +16,9 @@ #ifdef HAVE_DIRENT_H #include #endif +#ifdef HAVE_SIGNAL_H +#include +#endif #ifdef SYS_UNIX #include "unix.h" #endif /* defined(SYS_UNIX) */ @@ -65,7 +68,7 @@ extern int rl_intr; extern int rl_kill; extern int rl_quit; extern char *rl_complete(); -extern int rl_list_possib(); +extern int rl_list_possib(char *pathname, char ***avp); extern void rl_ttyset(); extern void rl_add_slash(); diff --git a/src/unix.h b/src/unix.h index 82b0b2b..42890a8 100755 --- a/src/unix.h +++ b/src/unix.h @@ -8,6 +8,7 @@ #include #include +#include #if defined(USE_DIRENT) #include