summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2003-03-27 07:11:16 (GMT)
committermdejong <mdejong>2003-03-27 07:11:16 (GMT)
commit5775be2569a55d245b9f3dc34eefe98fc5e17cff (patch)
treea34d7090a3404299ca494dbf88be32bfab959f84
parentf7123ccfd4a4cb32d8691f19b593337091b2431b (diff)
downloadtcl-5775be2569a55d245b9f3dc34eefe98fc5e17cff.zip
tcl-5775be2569a55d245b9f3dc34eefe98fc5e17cff.tar.gz
tcl-5775be2569a55d245b9f3dc34eefe98fc5e17cff.tar.bz2
* unix/configure: Regen.
* unix/tcl.m4 (SC_CONFIG_CFLAGS, SC_TCL_LINK_LIBS): Add BeOS system to SC_CONFIG_CFLAGS. Check for inet_ntoa in -lbind, needed for BeOS.
-rw-r--r--ChangeLog7
-rwxr-xr-xunix/configure73
-rw-r--r--unix/tcl.m416
3 files changed, 96 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 20fc9ea..0179f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-26 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * unix/configure: Regen.
+ * unix/tcl.m4 (SC_CONFIG_CFLAGS, SC_TCL_LINK_LIBS):
+ Add BeOS system to SC_CONFIG_CFLAGS. Check for
+ inet_ntoa in -lbind, needed for BeOS.
+
2003-03-26 Don Porter <dgp@users.sourceforge.net>
* doc/tcltest.n:
diff --git a/unix/configure b/unix/configure
index d33f5c1..e6bce4d 100755
--- a/unix/configure
+++ b/unix/configure
@@ -10353,6 +10353,70 @@ fi
fi
+ #--------------------------------------------------------------------
+ # 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
+
+
# Don't perform the eval of the libraries here because DL_LIBS
# won't be set until we call SC_CONFIG_CFLAGS
@@ -10869,6 +10933,15 @@ echo "$as_me: WARNING: \"64bit mode not supported with GCC on $system\"" >&2;}
fi
fi
;;
+ BeOS*)
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -nostart"
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+ LDFLAGS=""
+ ;;
BSD/OS-2.1*|BSD/OS-3*)
SHLIB_CFLAGS=""
SHLIB_LD="shlicc -r"
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index a9baae1..239fe4c 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -920,6 +920,15 @@ dnl AC_CHECK_TOOL(AR, ar)
fi
fi
;;
+ BeOS*)
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -nostart"
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+ LDFLAGS=""
+ ;;
BSD/OS-2.1*|BSD/OS-3*)
SHLIB_CFLAGS=""
SHLIB_LD="shlicc -r"
@@ -2328,6 +2337,13 @@ AC_DEFUN(SC_TCL_LINK_LIBS, [
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