[multiple changes]

2000-10-09  Alexandre Oliva  <aoliva@redhat.com>

	* configure.in (GCJ): Avoid bogus error message when looking for
	(and not finding) gcj in the build tree.
	* configure: Rebuilt.

2000-10-09  Tom Tromey  <tromey@cygnus.com>

	* configure: Rebuilt.
	* configure.in: Include sys/types.h when checking for socklen_t.
	From Arno J. Klaassen.

From-SVN: r36811

libjava/ChangeLog

+2000-10-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (GCJ): Avoid bogus error message when looking for
+	(and not finding) gcj in the build tree.
+	* configure: Rebuilt.
+
+2000-10-09  Tom Tromey  <tromey@cygnus.com>
+
+	* configure: Rebuilt.
+	* configure.in: Include sys/types.h when checking for socklen_t.
+	From Arno J. Klaassen.
+
 2000-10-09  Bryce McKinlay  <bryce@albatross.co.nz>
 
 	* include/jvm.h: Enable __builtin_expect().

libjava/configure.in

@@ -590,8 +590,8 @@ changequote(<<,>>)
       builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
 changequote([,])
    fi
-   dir="`cd ${builddotdot}/../../gcc && pwd`"
-   if test -x "${dir}/gcj"; then
+   if test -x "${builddotdot}/../../gcc/gcj"; then
+      dir="`cd ${builddotdot}/../../gcc && pwd`"
       GCJ="$dir/gcj -B`pwd`/ -B$dir/"
    else
       CANADIAN=yes
@@ -705,7 +705,8 @@ AC_TRY_COMPILE([#include <netinet/in.h>], [struct sockaddr_in6 addr6;],
   [AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING([for socklen_t in sys/socket.h])
-AC_TRY_COMPILE([#include <sys/socket.h>], [socklen_t x = 5;],
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/socket.h>], [socklen_t x = 5;],
   [AC_DEFINE(HAVE_SOCKLEN_T)
    AC_MSG_RESULT(yes)],
   [AC_MSG_RESULT(no)])