diff options
Diffstat (limited to 'libjava/configure.in')
| -rw-r--r-- | libjava/configure.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libjava/configure.in b/libjava/configure.in index 0cbdcb2149a..2cc2e1e67b1 100644 --- a/libjava/configure.in +++ b/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)]) |