Changeset 96

Timestamp:

08/02/04 23:12:33 (4 years ago)

Author:

morris

Message:

test for termcap.h and termios.h

Files:

• wire/trunk/config.h.in (modified) (1 diff)
• wire/trunk/configure (modified) (3 diffs)
• wire/trunk/configure.in (modified) (2 diffs)
• wire/trunk/wire/client.c (modified) (2 diffs)
• wire/trunk/wire/main.c (modified) (2 diffs)

wire/trunk/config.h.in

@@ -180 +180 @@
-#undef HAVE_SYS_TYPES_H
-
+/* Define to 1 if you have the <termcap.h> header file. */
+#undef HAVE_TERMCAP_H
+
-/* Define to 1 if you have the <termios.h> header file. */
-#undef HAVE_TERMIOS_H
+
+/* Define to 1 if you have the <term.h> header file. */
+#undef HAVE_TERM_H
-
-/* Define to 1 if you have the `uname' function. */

wire/trunk/configure

@@ -3510 +3510 @@
-
-
+# Check if we need the network services library
+echo "$as_me:$LINENO: checking for inet_aton" >&5
+echo $ECHO_N "checking for inet_aton... $ECHO_C" >&6
+if test "${ac_cv_func_inet_aton+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char inet_aton (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char inet_aton ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_inet_aton) || defined (__stub___inet_aton)
+choke me
+#else
+char (*f) () = inet_aton;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != inet_aton;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_inet_aton=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_inet_aton=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_inet_aton" >&5
+echo "${ECHO_T}$ac_cv_func_inet_aton" >&6
+if test $ac_cv_func_inet_aton = yes; then
+  :
+else
+
+        echo "$as_me:$LINENO: checking for inet_aton in -lresolv" >&5
+echo $ECHO_N "checking for inet_aton in -lresolv... $ECHO_C" >&6
+if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lresolv  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char inet_aton ();
+int
+main ()
+{
+inet_aton ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_resolv_inet_aton=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_resolv_inet_aton=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_aton" >&5
+echo "${ECHO_T}$ac_cv_lib_resolv_inet_aton" >&6
+if test $ac_cv_lib_resolv_inet_aton = yes; then
+
+                LIBS="$LIBS -lresolv"
+
+fi
+
+
+fi
+
+
+
-# Check for the OpenSSL crypto library
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
@@ -5925 +6067 @@
-
-
+
-for ac_header in  \
-        arpa/inet.h \
@@ -5937 +6080 @@
-        sys/socket.h \
-        sys/time.h \
+        termcap.h \
-        termios.h \
-        unistd.h \

wire/trunk/configure.in

@@ -92 +92 @@
-        AC_CHECK_LIB([nsl], [gethostent], [
-                LIBS="$LIBS -lnsl"
+        ])
+])
+
+
+# Check if we need the network services library
+AC_CHECK_FUNC([inet_aton], [], [
+        AC_CHECK_LIB([resolv], [inet_aton], [
+                LIBS="$LIBS -lresolv"
-        ])
-])
@@ -219 +227 @@
-        sys/socket.h \
-        sys/time.h \
+        termcap.h \
-        termios.h \
-        unistd.h \

wire/trunk/wire/client.c

@@ -1 @@
-2 2004/07/28 11:28:22
+3 2004/08/02 21:12:33
-
-/*
@@ -1431 +1431 @@
-
-
+
-void wr_msg_411(int argc, char *argv[]) {
-        wr_list_node_t  *node;

wire/trunk/wire/main.c

@@ -1 @@
-5 2004/07/28 11:28:22
+6 2004/08/02 21:12:33
-
-/*
@@ -42 +42 @@
-#include <dirent.h>
-#include <libgen.h>
+
+#ifdef HAVE_TERMCAP_H
-#include <termcap.h>
+#endif
+
+#ifdef HAVE_TERMIOS_H
-#include <termios.h>
+#endif
+
-#include <readline/readline.h>
-#include <readline/history.h>