summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2003-04-02 06:38:22 (GMT)
committermdejong <mdejong>2003-04-02 06:38:22 (GMT)
commit20cd923c20d063b70a4815998f45cd0443742667 (patch)
tree7be3e507b0298394aa7c201e79bbe3c74c97fecc
parent5dd4bde76554ecf958bc38bdac2bc8b475c44892 (diff)
downloadtk-20cd923c20d063b70a4815998f45cd0443742667.zip
tk-20cd923c20d063b70a4815998f45cd0443742667.tar.gz
tk-20cd923c20d063b70a4815998f45cd0443742667.tar.bz2
* unix/configure: Regen.
* unix/tcl.m4: Update from Tcl.
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/configure64
-rw-r--r--unix/tcl.m414
3 files changed, 76 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index feb5806..0e628bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-01 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * unix/configure: Regen.
+ * unix/tcl.m4: Update from Tcl.
+
2003-04-01 Don Porter <dgp@users.sourceforge.net>
* tests/all.tcl: Made better use of a common
diff --git a/unix/configure b/unix/configure
index 08dddfd..1b71dd7 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4546,6 +4546,70 @@ echo "$as_me: WARNING: \"64bit mode not supported with GCC on $system\"" >&2;}
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
LDFLAGS=""
+
+ #-----------------------------------------------------------
+ # Check for inet_ntoa in -lbind, for BeOS (which also needs
+ # -lsocket, even if the network functions are in -lnet which
+ # is always linked to, for compatibility.
+ #-----------------------------------------------------------
+ echo "$as_me:$LINENO: checking for inet_ntoa in -lbind" >&5
+echo $ECHO_N "checking for inet_ntoa in -lbind... $ECHO_C" >&6
+if test "${ac_cv_lib_bind_inet_ntoa+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbind $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_ntoa ();
+int
+main ()
+{
+inet_ntoa ();
+ ;
+ 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_bind_inet_ntoa=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_bind_inet_ntoa=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_bind_inet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_bind_inet_ntoa" >&6
+if test $ac_cv_lib_bind_inet_ntoa = yes; then
+ LIBS="$LIBS -lbind -lsocket"
+fi
+
;;
BSD/OS-2.1*|BSD/OS-3*)
SHLIB_CFLAGS=""
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 67128a2..10f9a06 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -928,6 +928,13 @@ dnl AC_CHECK_TOOL(AR, ar)
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
LDFLAGS=""
+
+ #-----------------------------------------------------------
+ # Check for inet_ntoa in -lbind, for BeOS (which also needs
+ # -lsocket, even if the network functions are in -lnet which
+ # is always linked to, for compatibility.
+ #-----------------------------------------------------------
+ AC_CHECK_LIB(bind, inet_ntoa, [LIBS="$LIBS -lbind -lsocket"])
;;
BSD/OS-2.1*|BSD/OS-3*)
SHLIB_CFLAGS=""
@@ -2336,13 +2343,6 @@ AC_DEFUN(SC_TCL_LINK_LIBS, [
fi
AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname,
[LIBS="$LIBS -lnsl"])])
-
- #--------------------------------------------------------------------
- # Check for inet_ntoa in -lbind, for BeOS (which also needs -lsocket,
- # even if the network functions are in -lnet which is always linked
- # to, for compatibility.
- #--------------------------------------------------------------------
- AC_CHECK_LIB(bind, inet_ntoa, [LIBS="$LIBS -lbind -lsocket"])
# Don't perform the eval of the libraries here because DL_LIBS
# won't be set until we call SC_CONFIG_CFLAGS