diff --git a/configure b/configure
index d1e877b1..19aed6e2 100755
--- a/configure
+++ b/configure
@@ -10624,6 +10624,10 @@ $(.mod).o:
 	$(F90) $(F90COPT) $(FINCLUDES)  -c $<
 %$(.mod): %.f90
 	$(F90) $(F90COPT) $(FINCLUDES)  -c $<
+%.o: %.f03
+	$(F90) $(F90COPT) $(FINCLUDES)  -c $<
+%$(.mod): %.f03
+	$(F90) $(F90COPT) $(FINCLUDES)  -c $<
 %.o: %.F
 	$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES)  -c $<
 %$(.mod): %.F
@@ -10631,7 +10635,11 @@ $(.mod).o:
 %.o: %.F90
 	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES)  -c $<
 %$(.mod): %.F90
-	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<'
+	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
+%.o: %.F03
+	$(F03) $(F90COPT) $(FINCLUDES) $(FDEFINES)  -c $<
+%$(.mod): %.F03
+	$(F03) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<'
 
 else
 
@@ -10654,6 +10662,10 @@ $(.mod).o:
 	$(F90) $(F90COPT) $(FINCLUDES) -c $<
 .f90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) -c $<
+.f03$(.mod):
+	$(F03) $(F90COPT) $(FINCLUDES) -c $<
+.f03.o:
+	$(F03) $(F90COPT) $(FINCLUDES) -c $<
 .F.o:
 	$(FC)  $(FCOPT)   $(FINCLUDES) $(FDEFINES) -c $<
 .F$(.mod):
@@ -10661,7 +10673,11 @@ $(.mod).o:
 .F90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
 .F90$(.mod):
-	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<'
+	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
+.F03.o:
+	$(F03) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
+.F03$(.mod):
+	$(F03) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<'
 
 fi
 
@@ -11820,7 +11836,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
diff --git a/configure.ac b/configure.ac
index 0315c441..d09decd6 100755
--- a/configure.ac
+++ b/configure.ac
@@ -682,7 +682,7 @@ $(.mod).o:
 %.o: %.F90
 	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES)  -c $<
 %$(.mod): %.F90
-	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<'
+	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
 %.o: %.F03
 	$(F03) $(F90COPT) $(FINCLUDES) $(FDEFINES)  -c $<
 %$(.mod): %.F03
@@ -720,7 +720,7 @@ $(.mod).o:
 .F90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
 .F90$(.mod):
-	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<'
+	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
 .F03.o:
 	$(F03) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
 .F03$(.mod):