summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2001-07-25 22:00:18 +0000
committerJose Antonio Ortega Ruiz <jao@gnu.org>2001-07-25 22:00:18 +0000
commit02108b05dac2d5426a2740929261046812b9cec7 (patch)
tree86680ee444dc3b79da1e1748f029fd39c416dbbb
parentdb934852a95f4ee7af02f3a8431b286a7d6a7366 (diff)
downloadmdk-02108b05dac2d5426a2740929261046812b9cec7.tar.gz
mdk-02108b05dac2d5426a2740929261046812b9cec7.tar.bz2
rl_completion_matches check
-rw-r--r--aclocal.m46
-rw-r--r--configure.in3
-rw-r--r--mixutils/mixvm_command.c5
-rw-r--r--po/ChangeLog16
4 files changed, 26 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 09e06fa..7afbd71 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -277,7 +277,7 @@ AC_DECL_YYTEXT])
# Ulrich Drepper <drepper@cygnus.com>, 1995.
#
# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
+# be used in projects which are not available under the GNU General Public License
# but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available.
@@ -627,7 +627,7 @@ strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
# Ulrich Drepper <drepper@cygnus.com>, 1996.
#
# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
+# be used in projects which are not available under the GNU General Public License
# but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available.
@@ -790,7 +790,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
# Ulrich Drepper <drepper@cygnus.com>, 1995.
#
# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
+# be used in projects which are not available under the GNU General Public License
# but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available.
diff --git a/configure.in b/configure.in
index da9864e..f0ee705 100644
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,9 @@ fi
if test x$readl = xtrue; then
AC_CHECK_LIB(history, add_history, ,
[AC_MSG_WARN(Cannot find GNU history lib) readl=false])
+dnl old versions of readline use completion_matches instead
+dnl of rl_completion_matches
+AC_CHECK_FUNCS(rl_completion_matches,,)
fi
dnl Check for glib
diff --git a/mixutils/mixvm_command.c b/mixutils/mixvm_command.c
index d13e5ac..610f79a 100644
--- a/mixutils/mixvm_command.c
+++ b/mixutils/mixvm_command.c
@@ -30,7 +30,10 @@
#ifdef HAVE_LIBREADLINE
# include <readline/readline.h>
# include <readline/history.h>
-#else
+# ifndef HAVE_RL_COMPLETION_MATCHES /* old versions of rl don't use rl_ */
+# define rl_completion_matches completion_matches
+# endif
+#else /* ! HAVE_LIBREADLINE */
typedef int Function ();
#endif /* HAVE_LIBREADLINE */
diff --git a/po/ChangeLog b/po/ChangeLog
index de6a207..820cb9e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,19 @@
+2001-07-23 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-07-23 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-07-23 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2001-07-23 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.38.
+
2001-07-18 gettextize <bug-gnu-utils@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.10.38.