diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2ce212138bc..1333cb4f971 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-21  Richard Earnshaw  <rearnsha@arm.com>
+
+	* configure.in: Fix detection of gcj when building with newlib.
+	* configure: Regenerated.
+
 2003-08-20  Graydon Hoare  <graydon@redhat.com>
 
 	* jni.cc: Replace "cheating" pointer-casting code with
diff --git a/libjava/configure b/libjava/configure
index a8ea89652db..a3554a9a090 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -7310,14 +7310,14 @@ else
 fi
 
    fi
+fi
 
-   if test -z "${with_multisubdir}"; then
-      builddotdot=.
-   else
+if test -z "${with_multisubdir}"; then
+   builddotdot=.
+else
 
-      builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
+   builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
 
-   fi
 fi
 
 # Which gcj do we use?
diff --git a/libjava/configure.in b/libjava/configure.in
index 25bd5223045..24224dbc0f6 100644
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -798,14 +798,14 @@ else
    if test "$GC" = boehm; then
       AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl")
    fi
+fi
 
-   if test -z "${with_multisubdir}"; then
-      builddotdot=.
-   else
+if test -z "${with_multisubdir}"; then
+   builddotdot=.
+else
 changequote(<<,>>)
-      builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
+   builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
 changequote([,])
-   fi
 fi
 
 # Which gcj do we use?