configure.in: Change test for cgetent to use HAVE_ instead of HAS_,

and add a test for gettosbyname().

getent.c: Use HAVE_CGETENT instead of HAS_CGETENT

parsetos.c: Use HAVE_GETTOSBYNAME instead of HAS_GETTOS

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10569 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index 1a50bd4f034d6259694afda7a9c670c14f04f66e..494050438de94c76b9bcaaead980e4c952407063 100644 (file)
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,12 @@
+Tue Mar  3 14:43:30 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * configure.in: Change test for cgetent to use HAVE_ instead
+               of HAS_, and add a test for gettosbyname().
+
+       * getent.c: Use HAVE_CGETENT instead of HAS_CGETENT
+
+       * parsetos.c: Use HAVE_GETTOSBYNAME instead of HAS_GETTOS
+
 1998-05-06  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * getopt.c (getopt): POSIX states that getopt returns -1 when it

diff --git a/src/appl/telnet/libtelnet/configure.in b/src/appl/telnet/libtelnet/configure.in
index b2bc50ee9ce1bcf5ba287a2742743d0ffdbe269d..3bae866457a08e980f0de8eea1944961e7660e89 100644 (file)
--- a/src/appl/telnet/libtelnet/configure.in
+++ b/src/appl/telnet/libtelnet/configure.in
@@ -4,7 +4,7 @@ AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_REPLACE_FUNCS([strcasecmp strdup setenv setsid strerror strftime getopt herror parsetos])
-AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT))
+AC_CHECK_FUNCS(gettosbyname cgetent)
 AC_CHECK_HEADERS(stdlib.h string.h)
 LIBOBJS="$LIBOBJS getent.o"
 AC_CONST

diff --git a/src/appl/telnet/libtelnet/getent.c b/src/appl/telnet/libtelnet/getent.c
index 40e7c1d1f27d471353391180042108c7eb03ff1d..7a80f54de93e336418af781edfb6f5964b5d06be 100644 (file)
--- a/src/appl/telnet/libtelnet/getent.c
+++ b/src/appl/telnet/libtelnet/getent.c
@@ -39,7 +39,7 @@ static char *area;
 getent(cp, name)
 char *cp, *name;
 {
-#ifdef HAS_CGETENT
+#ifdef HAVE_CGETENT
        char *dba[2];
 
        dba[0] = "/etc/gettytab";
@@ -56,11 +56,11 @@ char *
 getstr(id, cpp)
 char *id, **cpp;
 {
-# ifdef        HAS_CGETENT
+#ifdef HAVE_CGETENT
        char *answer;
        return((cgetstr(area, id, &answer) > 0) ? answer : 0);
-# else
+#else
        return(0);
-# endif
+#endif
 }
 #endif

diff --git a/src/appl/telnet/libtelnet/parsetos.c b/src/appl/telnet/libtelnet/parsetos.c
index 1a0430dd704e852c6d67954e1cfbcd271eedbae4..ad2a3a28aef5f983af46043ffa77cda53bdae5aa 100644 (file)
--- a/src/appl/telnet/libtelnet/parsetos.c
+++ b/src/appl/telnet/libtelnet/parsetos.c
@@ -21,7 +21,7 @@ char  *proto;
        register char   *c;
        int             tos;
 
-#ifdef HAS_GETTOS
+#ifdef HAVE_GETTOSBYNAME
        struct tosent   *tosp;
 
        tosp = gettosbyname(name, proto);