diff --git a/ChangeLog b/ChangeLog
index e66a4cdac42..8646d2d05e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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
+
 1998-01-13  Lee Iverson   (leei@ai.sri.com)
 
 	* config-ml.in (multi-do): LDFLAGS must include multilib
diff --git a/configure.in b/configure.in
index 68d0d9dd58e..25db03d904b 100644
--- a/configure.in
+++ b/configure.in
@@ -278,7 +278,9 @@ if [ x${shared} = xyes ]; then
       host_makefile_frag="${host_makefile_frag} config/mh-elfalphapic"
       ;;
     *)
-      host_makefile_frag="${host_makefile_frag} config/mh-${host_cpu}pic"
+      if test -f config/mh-${host_cpu}pic; then
+        host_makefile_frag="${host_makefile_frag} config/mh-${host_cpu}pic"
+      fi
       ;;
   esac
 fi
@@ -898,7 +900,9 @@ if [ x${shared} = xyes ]; then
       target_makefile_frag="${target_makefile_frag} config/mt-elfalphapic"
       ;;
     *)
-      target_makefile_frag="${target_makefile_frag} config/mt-${target_cpu}pic"
+      if test -f config/mt-${target_cpu}pic; then
+        target_makefile_frag="${target_makefile_frag} config/mt-${target_cpu}pic"
+      fi
       ;;
   esac
 fi