diff --git a/ChangeLog b/ChangeLog
index 7f89370ac4..993a8008e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Jan 17 21:04:59 1998 H.J. Lu  (hjl@gnu.org)
+
+	* configure.in: Check makefile fragments in the source
+	directory.
+
+Fri Jan 16 00:41:37 1998  Alexandre Oliva <oliva@dcc.unicamp.br>
+
+	* configure.in: check whether host and target makefile
+	fragments exist before adding them to *_makefile_frag
+
 start-sanitize-vr4111
 Thu Jan 15 09:36:48 1998  Gavin Koch  <gavin@cygnus.com>
 
diff --git a/configure.in b/configure.in
index 8a5664ae04..4cae0e438c 100644
--- a/configure.in
+++ b/configure.in
@@ -284,7 +284,7 @@ if [ x${shared} = xyes ]; then
       host_makefile_frag="${host_makefile_frag} config/mh-elfalphapic"
       ;;
     *)
-      if test -f config/mh-${host_cpu}pic; then
+      if test -f ${srcdir}/config/mh-${host_cpu}pic; then
         host_makefile_frag="${host_makefile_frag} config/mh-${host_cpu}pic"
       fi
       ;;
@@ -958,7 +958,7 @@ if [ x${shared} = xyes ]; then
       target_makefile_frag="${target_makefile_frag} config/mt-elfalphapic"
       ;;
     *)
-      if test -f config/mt-${target_cpu}pic; then
+      if test -f ${srcdir}/config/mt-${target_cpu}pic; then
         target_makefile_frag="${target_makefile_frag} config/mt-${target_cpu}pic"
       fi
       ;;