Add support for GNU rx library for those lacking regexp support

diff --git a/ChangeLog b/ChangeLog
index c7099dc2743d5bb2a4deece7536dfaa82c48d550..bbd97b9509705457232c5dd0e02ef6d546726870 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 20001014
 20001014

+ - (bal) Add support for GNU rx library for those lacking regexp support 

  - (djm) Don't accept PAM_PROMPT_ECHO_ON messages during initial auth
  - (djm) Revert SSH2 serverloop hack, will find a better way.
  - (djm) Add workaround for Linux 2.4's gratuitious errno change. Patch
  - (djm) Don't accept PAM_PROMPT_ECHO_ON messages during initial auth
  - (djm) Revert SSH2 serverloop hack, will find a better way.
  - (djm) Add workaround for Linux 2.4's gratuitious errno change. Patch

diff --git a/INSTALL b/INSTALL
index 4824ada63e3ba523356f982e87d3e79e4c5729c6..b201eccd54770c8137a153e2f2a98f82f7964aa8 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -40,6 +40,13 @@ ftp://ftp.gnu.org/gnu/make/
 OpenSSH has only been tested with GNU make. It may work with other
 'make' programs, but you are on your own.
 
 OpenSSH has only been tested with GNU make. It may work with other
 'make' programs, but you are on your own.
 

+GNU rx:
+ftp:://ftp.gnu.org/gnu/rx/
+
+Most platforms do not required this.  However older 4.3 BSD do not
+have a posix regex library. 
+
+

 2. Building / Installation
 --------------------------
 
 2. Building / Installation
 --------------------------
 

diff --git a/TODO b/TODO
index 93d8998b230c3aa78d9531373befc3e8526380ec..d32c5d5b06fe8e34adab7caf89e630a525628c8c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -9,6 +9,4 @@
 
 - Cleanup configure.in
 
 
 - Cleanup configure.in
 

-- utmp/wtmp logging does not work on NeXT
-

 - Complete Tru64 SIA support
 - Complete Tru64 SIA support

diff --git a/acconfig.h b/acconfig.h
index a17cba82534ce941fe8642938966fd3230a4e9aa..3bf61ec92aa49388b5cad74586d09a931b072111 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -52,6 +52,9 @@
 /* Define if you are on Cygwin */
 #undef HAVE_CYGWIN
 
 /* Define if you are on Cygwin */
 #undef HAVE_CYGWIN
 

+/* Define if you lack native POSIX regex and you are using GNU rx library */
+#undef HAVE_LIBRX
+

 /* Define if you are on NeXT */
 #undef HAVE_NEXT
 
 /* Define if you are on NeXT */
 #undef HAVE_NEXT
 

diff --git a/compat.c b/compat.c
index 19dc76d961667934c2bd2ce7a9f8f6875a03fea1..71d12010c15aab5f4657dbecb5f7943ef58be5b5 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -29,7 +29,11 @@ RCSID("$OpenBSD: compat.c,v 1.24 2000/10/10 20:20:45 markus Exp $");
 #include "packet.h"
 #include "xmalloc.h"
 #include "compat.h"
 #include "packet.h"
 #include "xmalloc.h"
 #include "compat.h"

-#include <regex.h>
+#ifdef HAVE_LIBRX
+#  include <rxposix.h>
+#else /* Use native regex libraries */
+#  include <regex.h>
+#endif /* HAVE_LIBRX */

 
 int compat13 = 0;
 int compat20 = 0;
 
 int compat13 = 0;
 int compat20 = 0;

diff --git a/configure.in b/configure.in
index 7ff324bb068d1beb2e9420f5c98e726af216c8ce..a6bed7508ea272487bed6a4791513c5655d9a168 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -256,6 +256,7 @@ AC_ARG_WITH(libs,
 # Checks for libraries.
 AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***]))
 AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil")
 # Checks for libraries.
 AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***]))
 AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil")

+AC_CHECK_LIB(rx, regcomp, AC_DEFINE(HAVE_LIBRX) LIBS="$LIBS -lrx")

 
 if test -z "$no_libsocket" ; then
        AC_CHECK_LIB(nsl, yp_match, , )
 
 if test -z "$no_libsocket" ; then
        AC_CHECK_LIB(nsl, yp_match, , )