merge post-1.3.0 fixes

findutils/find.c

@@ -76,6 +76,7 @@ static action ***actions;
 static int need_print = 1;
 
 
+#if ENABLE_FEATURE_FIND_EXEC
 static int count_subst(const char *str)
 {
 	int count = 0;
@@ -103,6 +104,7 @@ static char* subst(const char *src, int count, const char* filename)
 	strcpy(dst, src);
 	return buf;
 }
+#endif
 
 
 static int exec_actions(action ***appp, const char *fileName, struct stat *statbuf)
@@ -556,8 +558,8 @@ int find_main(int argc, char **argv)
 			argp[0] = "-a";
 		}
 		argp++;
-	}
 #endif
+	}
 
 	actions = parse_params(&argv[firstopt]);